Skip to content

Commit 4e984da

Browse files
committed
Merge remote-tracking branch 'origin/rc-4.0.5' into ofio_outlist
2 parents 1a507ac + a4b4fdb commit 4e984da

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

glue-codes/fast-farm/MD_Shared/IEA-15-240-RWT-UMaineSemi_T1.fst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ False Echo - Echo input data to <RootName>.ech (flag)
1414
1 CompInflow - Compute inflow wind velocities (switch) {0=still air; 1=InflowWind; 2=external from OpenFOAM}
1515
2 CompAero - Compute aerodynamic loads (switch) {0=None; 1=AeroDyn v14; 2=AeroDyn v15}
1616
0 CompServo - Compute control and electrical-drive dynamics (switch) {0=None; 1=ServoDyn}
17-
1 CompSeaState - Compute sea state information (switch) {0=None; 1=SeaState}
17+
1 CompSeaSt - Compute sea state information (switch) {0=None; 1=SeaState}
1818
1 CompHydro - Compute hydrodynamic loads (switch) {0=None; 1=HydroDyn}
1919
0 CompSub - Compute sub-structural dynamics (switch) {0=None; 1=SubDyn}
2020
0 CompMooring - Compute mooring system (switch) {0=None; 1=MAP++; 2=FEAMooring; 3=MoorDyn; 4=OrcaFlex}
@@ -37,8 +37,8 @@ False Echo - Echo input data to <RootName>.ech (flag)
3737
"" BDBldFile(3) - Name of file containing BeamDyn input parameters for blade 3 (quoted string)
3838
"InflowWind_WT1.dat" InflowFile - Name of file containing inflow wind input parameters (quoted string)
3939
"IEA-15-240-RWT_AeroDyn.dat" AeroFile - Name of file containing aerodynamic input parameters (quoted string)
40-
"unused" ServoFile - Name of file containing control and electrical-drive input parameters (quoted string)
41-
"SeaState.dat" SeaStateFile - Name of file containing sea state input parameters (quoted string)
40+
"unused" ServoFile - Name of file containing control and electrical-drive input parameters (quoted string)
41+
"SeaState.dat" SeaStFile - Name of file containing sea state input parameters (quoted string)
4242
"IEA-15-240-RWT-UMaineSemi_HydroDynT1.dat" HydroFile - Name of file containing hydrodynamic input parameters (quoted string)
4343
"unused" SubFile - Name of file containing sub-structural input parameters (quoted string)
4444
"" MooringFile - NamTe of file containing mooring system input parameters (quoted string)

glue-codes/fast-farm/MD_Shared/IEA-15-240-RWT-UMaineSemi_T2.fst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ False Echo - Echo input data to <RootName>.ech (flag)
1414
1 CompInflow - Compute inflow wind velocities (switch) {0=still air; 1=InflowWind; 2=external from OpenFOAM}
1515
2 CompAero - Compute aerodynamic loads (switch) {0=None; 1=AeroDyn v14; 2=AeroDyn v15}
1616
0 CompServo - Compute control and electrical-drive dynamics (switch) {0=None; 1=ServoDyn}
17-
1 CompSeaState - Compute sea state information (switch) {0=None; 1=SeaState}
17+
1 CompSeaSt - Compute sea state information (switch) {0=None; 1=SeaState}
1818
1 CompHydro - Compute hydrodynamic loads (switch) {0=None; 1=HydroDyn}
1919
0 CompSub - Compute sub-structural dynamics (switch) {0=None; 1=SubDyn}
2020
0 CompMooring - Compute mooring system (switch) {0=None; 1=MAP++; 2=FEAMooring; 3=MoorDyn; 4=OrcaFlex}
@@ -37,8 +37,8 @@ False Echo - Echo input data to <RootName>.ech (flag)
3737
"" BDBldFile(3) - Name of file containing BeamDyn input parameters for blade 3 (quoted string)
3838
"InflowWind_WT1.dat" InflowFile - Name of file containing inflow wind input parameters (quoted string)
3939
"IEA-15-240-RWT_AeroDyn.dat" AeroFile - Name of file containing aerodynamic input parameters (quoted string)
40-
"unused" ServoFile - Name of file containing control and electrical-drive input parameters (quoted string)
41-
"SeaState.dat" SeaStateFile - Name of file containing sea state input parameters (quoted string)
40+
"unused" ServoFile - Name of file containing control and electrical-drive input parameters (quoted string)
41+
"SeaState.dat" SeaStFile - Name of file containing sea state input parameters (quoted string)
4242
"IEA-15-240-RWT-UMaineSemi_HydroDynT2.dat" HydroFile - Name of file containing hydrodynamic input parameters (quoted string)
4343
"unused" SubFile - Name of file containing sub-structural input parameters (quoted string)
4444
"" MooringFile - NamTe of file containing mooring system input parameters (quoted string)

0 commit comments

Comments
 (0)