Skip to content

Commit

Permalink
Merge pull request #86 from OpenFAST/dev
Browse files Browse the repository at this point in the history 
Merge dev to main for 3.4.0 release
  • Loading branch information
@andrew-platt
andrew-platt authored Jan 11, 2023
2 parents 779b704 + eb372d4 commit 1acc4a1
Show file tree
Hide file tree
Showing 807 changed files with 49,789 additions and 7,143,170 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ install_manifest.txt
*.so
*.o
*.exp
*.exe
vtk*
*.lib

# temporary matlab files
Expand Down
185 changes: 101 additions & 84 deletions ...NRELOffshrBsline5MW_Onshore_AeroDyn15.dat → glue-codes/fast-farm/5MW_Baseline/AD.dat
View file

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions glue-codes/fast-farm/5MW_Baseline/NRELOffshrBsline5MW_AeroDyn_blade.dat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@
NREL 5.0 MW offshore baseline aerodynamic blade input properties; note that we need to add the aerodynamic center to this file
====== Blade Properties =================================================================
19 NumBlNds - Number of blade nodes used in the analysis (-)
BlSpn BlCrvAC BlSwpAC BlCrvAng BlTwist BlChord BlAFID
(m) (m) (m) (deg) (deg) (m) (-)
0.0000000E+00 0.0000000E+00 0.0000000E+00 0.0000000E+00 1.3308000E+01 3.5420000E+00 1
1.3667000E+00 -8.1531745E-04 -3.4468858E-03 0.0000000E+00 1.3308000E+01 3.5420000E+00 1
4.1000000E+00 -2.4839790E-02 -1.0501421E-01 0.0000000E+00 1.3308000E+01 3.8540000E+00 1
6.8333000E+00 -5.9469375E-02 -2.5141635E-01 0.0000000E+00 1.3308000E+01 4.1670000E+00 2
1.0250000E+01 -1.0909141E-01 -4.6120149E-01 0.0000000E+00 1.3308000E+01 4.5570000E+00 3
1.4350000E+01 -1.1573354E-01 -5.6986665E-01 0.0000000E+00 1.1480000E+01 4.6520000E+00 4
1.8450000E+01 -9.8316709E-02 -5.4850833E-01 0.0000000E+00 1.0162000E+01 4.4580000E+00 4
2.2550000E+01 -8.3186967E-02 -5.2457001E-01 0.0000000E+00 9.0110000E+00 4.2490000E+00 5
2.6650000E+01 -6.7933232E-02 -4.9624675E-01 0.0000000E+00 7.7950000E+00 4.0070000E+00 6
3.0750000E+01 -5.3393159E-02 -4.6544755E-01 0.0000000E+00 6.5440000E+00 3.7480000E+00 6
3.4850000E+01 -4.0899260E-02 -4.3583519E-01 0.0000000E+00 5.3610000E+00 3.5020000E+00 7
3.8950000E+01 -2.9722933E-02 -4.0591323E-01 0.0000000E+00 4.1880000E+00 3.2560000E+00 7
4.3050000E+01 -2.0511081E-02 -3.7569051E-01 0.0000000E+00 3.1250000E+00 3.0100000E+00 8
4.7150000E+01 -1.3980013E-02 -3.4521705E-01 0.0000000E+00 2.3190000E+00 2.7640000E+00 8
5.1250000E+01 -8.3819737E-03 -3.1463837E-01 0.0000000E+00 1.5260000E+00 2.5180000E+00 8
5.4666700E+01 -4.3546914E-03 -2.8909220E-01 0.0000000E+00 8.6300000E-01 2.3130000E+00 8
5.7400000E+01 -1.6838383E-03 -2.6074456E-01 0.0000000E+00 3.7000000E-01 2.0860000E+00 8
6.0133300E+01 -3.2815226E-04 -1.7737470E-01 0.0000000E+00 1.0600000E-01 1.4190000E+00 8
6.1499900E+01 -3.2815226E-04 -1.7737470E-01 0.0000000E+00 1.0600000E-01 1.4190000E+00 8
BlSpn BlCrvAC BlSwpAC BlCrvAng BlTwist BlChord BlAFID BlCb BlCenBn BlCenBt
(m) (m) (m) (deg) (deg) (m) (-) (-) (m) (m)
0.0000000E+00 0.0000000E+00 0.0000000E+00 0.0000000E+00 1.3308000E+01 3.5420000E+00 1 0.0 0.0 0.0
1.3667000E+00 -8.1531745E-04 -3.4468858E-03 0.0000000E+00 1.3308000E+01 3.5420000E+00 1 0.0 0.0 0.0
4.1000000E+00 -2.4839790E-02 -1.0501421E-01 0.0000000E+00 1.3308000E+01 3.8540000E+00 1 0.0 0.0 0.0
6.8333000E+00 -5.9469375E-02 -2.5141635E-01 0.0000000E+00 1.3308000E+01 4.1670000E+00 2 0.0 0.0 0.0
1.0250000E+01 -1.0909141E-01 -4.6120149E-01 0.0000000E+00 1.3308000E+01 4.5570000E+00 3 0.0 0.0 0.0
1.4350000E+01 -1.1573354E-01 -5.6986665E-01 0.0000000E+00 1.1480000E+01 4.6520000E+00 4 0.0 0.0 0.0
1.8450000E+01 -9.8316709E-02 -5.4850833E-01 0.0000000E+00 1.0162000E+01 4.4580000E+00 4 0.0 0.0 0.0
2.2550000E+01 -8.3186967E-02 -5.2457001E-01 0.0000000E+00 9.0110000E+00 4.2490000E+00 5 0.0 0.0 0.0
2.6650000E+01 -6.7933232E-02 -4.9624675E-01 0.0000000E+00 7.7950000E+00 4.0070000E+00 6 0.0 0.0 0.0
3.0750000E+01 -5.3393159E-02 -4.6544755E-01 0.0000000E+00 6.5440000E+00 3.7480000E+00 6 0.0 0.0 0.0
3.4850000E+01 -4.0899260E-02 -4.3583519E-01 0.0000000E+00 5.3610000E+00 3.5020000E+00 7 0.0 0.0 0.0
3.8950000E+01 -2.9722933E-02 -4.0591323E-01 0.0000000E+00 4.1880000E+00 3.2560000E+00 7 0.0 0.0 0.0
4.3050000E+01 -2.0511081E-02 -3.7569051E-01 0.0000000E+00 3.1250000E+00 3.0100000E+00 8 0.0 0.0 0.0
4.7150000E+01 -1.3980013E-02 -3.4521705E-01 0.0000000E+00 2.3190000E+00 2.7640000E+00 8 0.0 0.0 0.0
5.1250000E+01 -8.3819737E-03 -3.1463837E-01 0.0000000E+00 1.5260000E+00 2.5180000E+00 8 0.0 0.0 0.0
5.4666700E+01 -4.3546914E-03 -2.8909220E-01 0.0000000E+00 8.6300000E-01 2.3130000E+00 8 0.0 0.0 0.0
5.7400000E+01 -1.6838383E-03 -2.6074456E-01 0.0000000E+00 3.7000000E-01 2.0860000E+00 8 0.0 0.0 0.0
6.0133300E+01 -3.2815226E-04 -1.7737470E-01 0.0000000E+00 1.0600000E-01 1.4190000E+00 8 0.0 0.0 0.0
6.1499900E+01 -3.2815226E-04 -1.7737470E-01 0.0000000E+00 1.0600000E-01 1.4190000E+00 8 0.0 0.0 0.0

!bjj: because of precision in the BD-AD coupling, 61.5m didn't work, so I changed it to 61.4999m
6.1500000E+01 -3.2815226E-04 -1.7737470E-01 0.0000000E+00 1.0600000E-01 1.4190000E+00 8
6.1500000E+01 -3.2815226E-04 -1.7737470E-01 0.0000000E+00 1.0600000E-01 1.4190000E+00 8 0.0 0.0 0.0
108 changes: 54 additions & 54 deletions ...fshrBsline5MW_Onshore_ElastoDyn_Tower.dat → ...fshrBsline5MW_Onshore_ElastoDyn_Tower.dat
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
------- ELASTODYN V1.00.* TOWER INPUT FILE -------------------------------------
NREL 5.0 MW offshore baseline tower input properties.
---------------------- TOWER PARAMETERS ----------------------------------------
11 NTwInpSt - Number of input stations to specify tower geometry
1 TwrFADmp(1) - Tower 1st fore-aft mode structural damping ratio (%)
1 TwrFADmp(2) - Tower 2nd fore-aft mode structural damping ratio (%)
1 TwrSSDmp(1) - Tower 1st side-to-side mode structural damping ratio (%)
1 TwrSSDmp(2) - Tower 2nd side-to-side mode structural damping ratio (%)
---------------------- TOWER ADJUSTMUNT FACTORS --------------------------------
1 FAStTunr(1) - Tower fore-aft modal stiffness tuner, 1st mode (-)
1 FAStTunr(2) - Tower fore-aft modal stiffness tuner, 2nd mode (-)
1 SSStTunr(1) - Tower side-to-side stiffness tuner, 1st mode (-)
1 SSStTunr(2) - Tower side-to-side stiffness tuner, 2nd mode (-)
1 AdjTwMa - Factor to adjust tower mass density (-)
1 AdjFASt - Factor to adjust tower fore-aft stiffness (-)
1 AdjSSSt - Factor to adjust tower side-to-side stiffness (-)
---------------------- DISTRIBUTED TOWER PROPERTIES ----------------------------
HtFract TMassDen TwFAStif TwSSStif
(-) (kg/m) (Nm^2) (Nm^2)
0.0000000E+00 5.5908700E+03 6.1434300E+11 6.1434300E+11
1.0000000E-01 5.2324300E+03 5.3482100E+11 5.3482100E+11
2.0000000E-01 4.8857600E+03 4.6326700E+11 4.6326700E+11
3.0000000E-01 4.5508700E+03 3.9913100E+11 3.9913100E+11
4.0000000E-01 4.2277500E+03 3.4188300E+11 3.4188300E+11
5.0000000E-01 3.9164100E+03 2.9101100E+11 2.9101100E+11
6.0000000E-01 3.6168300E+03 2.4602700E+11 2.4602700E+11
7.0000000E-01 3.3290300E+03 2.0645700E+11 2.0645700E+11
8.0000000E-01 3.0530100E+03 1.7185100E+11 1.7185100E+11
9.0000000E-01 2.7887500E+03 1.4177600E+11 1.4177600E+11
1.0000000E+00 2.5362700E+03 1.1582000E+11 1.1582000E+11
---------------------- TOWER FORE-AFT MODE SHAPES ------------------------------
0.7004 TwFAM1Sh(2) - Mode 1, coefficient of x^2 term
2.1963 TwFAM1Sh(3) - , coefficient of x^3 term
-5.6202 TwFAM1Sh(4) - , coefficient of x^4 term
6.2275 TwFAM1Sh(5) - , coefficient of x^5 term
-2.504 TwFAM1Sh(6) - , coefficient of x^6 term
-70.5319 TwFAM2Sh(2) - Mode 2, coefficient of x^2 term
-63.7623 TwFAM2Sh(3) - , coefficient of x^3 term
289.737 TwFAM2Sh(4) - , coefficient of x^4 term
-176.513 TwFAM2Sh(5) - , coefficient of x^5 term
22.0706 TwFAM2Sh(6) - , coefficient of x^6 term
---------------------- TOWER SIDE-TO-SIDE MODE SHAPES --------------------------
1.385 TwSSM1Sh(2) - Mode 1, coefficient of x^2 term
-1.7684 TwSSM1Sh(3) - , coefficient of x^3 term
3.0871 TwSSM1Sh(4) - , coefficient of x^4 term
-2.2395 TwSSM1Sh(5) - , coefficient of x^5 term
0.5357 TwSSM1Sh(6) - , coefficient of x^6 term
-121.21 TwSSM2Sh(2) - Mode 2, coefficient of x^2 term
184.415 TwSSM2Sh(3) - , coefficient of x^3 term
-224.904 TwSSM2Sh(4) - , coefficient of x^4 term
298.536 TwSSM2Sh(5) - , coefficient of x^5 term
-135.838 TwSSM2Sh(6) - , coefficient of x^6 term
------- ELASTODYN V1.00.* TOWER INPUT FILE -------------------------------------
NREL 5.0 MW offshore baseline tower input properties.
---------------------- TOWER PARAMETERS ----------------------------------------
11 NTwInpSt - Number of input stations to specify tower geometry
1 TwrFADmp(1) - Tower 1st fore-aft mode structural damping ratio (%)
1 TwrFADmp(2) - Tower 2nd fore-aft mode structural damping ratio (%)
1 TwrSSDmp(1) - Tower 1st side-to-side mode structural damping ratio (%)
1 TwrSSDmp(2) - Tower 2nd side-to-side mode structural damping ratio (%)
---------------------- TOWER ADJUSTMUNT FACTORS --------------------------------
1 FAStTunr(1) - Tower fore-aft modal stiffness tuner, 1st mode (-)
1 FAStTunr(2) - Tower fore-aft modal stiffness tuner, 2nd mode (-)
1 SSStTunr(1) - Tower side-to-side stiffness tuner, 1st mode (-)
1 SSStTunr(2) - Tower side-to-side stiffness tuner, 2nd mode (-)
1 AdjTwMa - Factor to adjust tower mass density (-)
1 AdjFASt - Factor to adjust tower fore-aft stiffness (-)
1 AdjSSSt - Factor to adjust tower side-to-side stiffness (-)
---------------------- DISTRIBUTED TOWER PROPERTIES ----------------------------
HtFract TMassDen TwFAStif TwSSStif
(-) (kg/m) (Nm^2) (Nm^2)
0.0000000E+00 5.5908700E+03 6.1434300E+11 6.1434300E+11
1.0000000E-01 5.2324300E+03 5.3482100E+11 5.3482100E+11
2.0000000E-01 4.8857600E+03 4.6326700E+11 4.6326700E+11
3.0000000E-01 4.5508700E+03 3.9913100E+11 3.9913100E+11
4.0000000E-01 4.2277500E+03 3.4188300E+11 3.4188300E+11
5.0000000E-01 3.9164100E+03 2.9101100E+11 2.9101100E+11
6.0000000E-01 3.6168300E+03 2.4602700E+11 2.4602700E+11
7.0000000E-01 3.3290300E+03 2.0645700E+11 2.0645700E+11
8.0000000E-01 3.0530100E+03 1.7185100E+11 1.7185100E+11
9.0000000E-01 2.7887500E+03 1.4177600E+11 1.4177600E+11
1.0000000E+00 2.5362700E+03 1.1582000E+11 1.1582000E+11
---------------------- TOWER FORE-AFT MODE SHAPES ------------------------------
0.7004 TwFAM1Sh(2) - Mode 1, coefficient of x^2 term
2.1963 TwFAM1Sh(3) - , coefficient of x^3 term
-5.6202 TwFAM1Sh(4) - , coefficient of x^4 term
6.2275 TwFAM1Sh(5) - , coefficient of x^5 term
-2.504 TwFAM1Sh(6) - , coefficient of x^6 term
-70.5319 TwFAM2Sh(2) - Mode 2, coefficient of x^2 term
-63.7623 TwFAM2Sh(3) - , coefficient of x^3 term
289.737 TwFAM2Sh(4) - , coefficient of x^4 term
-176.513 TwFAM2Sh(5) - , coefficient of x^5 term
22.0706 TwFAM2Sh(6) - , coefficient of x^6 term
---------------------- TOWER SIDE-TO-SIDE MODE SHAPES --------------------------
1.385 TwSSM1Sh(2) - Mode 1, coefficient of x^2 term
-1.7684 TwSSM1Sh(3) - , coefficient of x^3 term
3.0871 TwSSM1Sh(4) - , coefficient of x^4 term
-2.2395 TwSSM1Sh(5) - , coefficient of x^5 term
0.5357 TwSSM1Sh(6) - , coefficient of x^6 term
-121.21 TwSSM2Sh(2) - Mode 2, coefficient of x^2 term
184.415 TwSSM2Sh(3) - , coefficient of x^3 term
-224.904 TwSSM2Sh(4) - , coefficient of x^4 term
298.536 TwSSM2Sh(5) - , coefficient of x^5 term
-135.838 TwSSM2Sh(6) - , coefficient of x^6 term


Loading

0 comments on commit 1acc4a1

Please sign in to comment.