Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VS-build updates for rc-3.5.1 and other minor updates #1818

Merged
merged 10 commits into from
Oct 19, 2023
Merged

VS-build updates for rc-3.5.1 and other minor updates #1818

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
81db061
Fix error in api_change.rst v3.3.0->v3.4.0
andrew-platt Oct 12, 2023
1ae0f58
Update MD_Types.f90 (only comments changed)
andrew-platt Oct 12, 2023
1501016
Wider plots from regression testing.
andrew-platt Oct 16, 2023
6ef1faa
VS-build: fix ADI_C, add non-OpenMP options to AD, ADI, IfW
andrew-platt Oct 18, 2023
ad28c73
OF: Regenerate FAST_Types so that NodeClusterType matches the registry
andrew-platt Oct 19, 2023
bd6715a
MD: regenerate MoorDyn_Types with correct comments to match registry
andrew-platt Oct 19, 2023
c939815
Updated the MD registry and types file
RyanDavies19 Oct 19, 2023
b31ea65
Merge pull request #17 from RyanDavies19/rc-3.5.1_VSprojUpdate
andrew-platt Oct 19, 2023
758cd65
Fix ADI registry in VS projects
bjonkman Oct 19, 2023
396df5a
Merge pull request #18 from bjonkman/rc-3.5.1_VSprojUpdate
andrew-platt Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/source/user/api_change.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Added in OpenFAST `3.4.0`
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Module Line Flag Name Example Value
============================================= ==== ================= ========================================================================================================================================================================================================
FAST.Farm 17 ModWake 1 Mod_Wake - Switch between wake formulations {1:Polar, 2:Curl, 3:Cartesian} (-) (switch)
FAST.Farm 42\* ModWake 1 Mod_Wake - Switch between wake formulations {1:Polar, 2:Curl, 3:Cartesian} (-) (switch)
FAST.Farm 67 CurlSection --- CURLED-WAKE PARAMETERS [only used if Mod_Wake=2 or 3] ---
FAST.Farm 68 Swirl DEFAULT Swirl - Switch to include swirl velocities in wake (-) (switch) [DEFAULT=True]
FAST.Farm 69 k_VortexDecay DEFAULT k_VortexDecay - Vortex decay constant for curl (-) [DEFAULT=0.01] [only used if Mod_Wake=2]
Expand Down
46 changes: 23 additions & 23 deletions modules/moordyn/src/MoorDyn_Types.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ MODULE MoorDyn_Types
! =======================
! ========= MD_Body =======
TYPE, PUBLIC :: MD_Body
INTEGER(IntKi) :: IdNum !< integer identifier of this point [-]
INTEGER(IntKi) :: typeNum !< integer identifying the type. 0=free, 1=fixed, -1=vessel [-]
INTEGER(IntKi) :: IdNum !< integer identifier of this Point [-]
INTEGER(IntKi) :: typeNum !< integer identifying the type. 0=fixed, 1=vessel, 2=point [-]
INTEGER(IntKi) , DIMENSION(1:30) :: AttachedC !< list of IdNums of points attached to this body [-]
INTEGER(IntKi) , DIMENSION(1:30) :: AttachedR !< list of IdNums of rods attached to this body [-]
INTEGER(IntKi) :: nAttachedC = 0 !< number of attached points [-]
Expand All @@ -119,8 +119,8 @@ MODULE MoorDyn_Types
REAL(DbKi) :: bodyM !< [-]
REAL(DbKi) :: bodyV !< [-]
REAL(DbKi) , DIMENSION(1:3) :: bodyI !< [-]
REAL(DbKi) , DIMENSION(1:6) :: bodyCdA !< product of drag force and frontal area of point [[m^2]]
REAL(DbKi) , DIMENSION(1:6) :: bodyCa !< added mass coefficient o point [-]
REAL(DbKi) , DIMENSION(1:6) :: bodyCdA !< product of drag force and frontal area of point point [[m^2]]
REAL(DbKi) , DIMENSION(1:6) :: bodyCa !< added mass coefficient of point point [-]
REAL(DbKi) :: time !< current time [[s]]
REAL(DbKi) , DIMENSION(1:6) :: r6 !< position [-]
REAL(DbKi) , DIMENSION(1:6) :: v6 !< velocity [-]
Expand All @@ -138,9 +138,9 @@ MODULE MoorDyn_Types
! =======================
! ========= MD_Point =======
TYPE, PUBLIC :: MD_Point
INTEGER(IntKi) :: IdNum !< integer identifier of this point [-]
INTEGER(IntKi) :: IdNum !< integer identifier of this Point [-]
CHARACTER(10) :: type !< type of Point: fix, vessel, point [-]
INTEGER(IntKi) :: typeNum !< integer identifying the type. 1=fixed, -1=vessel, 0=free [-]
INTEGER(IntKi) :: typeNum !< integer identifying the type. 0=fixed, 1=vessel, 2=point [-]
INTEGER(IntKi) , DIMENSION(1:10) :: Attached !< list of IdNums of lines attached to this point node [-]
INTEGER(IntKi) , DIMENSION(1:10) :: Top !< list of ints specifying whether each line is attached at 1 = top/fairlead(end B), 0 = bottom/anchor(end A) [-]
INTEGER(IntKi) :: nAttached = 0 !< number of attached lines [-]
Expand All @@ -149,8 +149,8 @@ MODULE MoorDyn_Types
REAL(DbKi) :: pointFX !< [-]
REAL(DbKi) :: pointFY !< [-]
REAL(DbKi) :: pointFZ !< [-]
REAL(DbKi) :: pointCa !< added mass coefficient of point [-]
REAL(DbKi) :: pointCdA !< product of drag force and frontal area of point [[m^2]]
REAL(DbKi) :: pointCa !< added mass coefficient of point point [-]
REAL(DbKi) :: pointCdA !< product of drag force and frontal area of point point [[m^2]]
REAL(DbKi) :: time !< current time [[s]]
REAL(DbKi) , DIMENSION(1:3) :: r !< position [-]
REAL(DbKi) , DIMENSION(1:3) :: rd !< velocity [-]
Expand All @@ -177,8 +177,8 @@ MODULE MoorDyn_Types
INTEGER(IntKi) :: nAttachedB = 0 !< number of attached lines to Rod end B [-]
INTEGER(IntKi) , DIMENSION(1:20) :: OutFlagList !< array specifying what line quantities should be output (1 vs 0) [-]
INTEGER(IntKi) :: N !< The number of elements in the line [-]
INTEGER(IntKi) :: endTypeA !< type of point at end A: 0=pinned to point, 1=cantilevered to Rod. [-]
INTEGER(IntKi) :: endTypeB !< type of point at end B: 0=pinned to point, 1=cantilevered to Rod. [-]
INTEGER(IntKi) :: endTypeA !< type of point at end A: 0=pinned to Point, 1=cantilevered to Rod. [-]
INTEGER(IntKi) :: endTypeB !< type of point at end B: 0=pinned to Point, 1=cantilevered to Rod. [-]
REAL(DbKi) :: UnstrLen !< length of the rod [[m]]
REAL(DbKi) :: mass !< mass of the rod [[kg]]
REAL(DbKi) :: rho !< density [[kg/m3]]
Expand All @@ -190,8 +190,8 @@ MODULE MoorDyn_Types
REAL(DbKi) :: CdEnd !< drag coefficient for rod end [[-]]
REAL(DbKi) :: CaEnd !< added mass coefficient for rod end [[-]]
REAL(DbKi) :: time !< current time [[s]]
REAL(DbKi) :: roll !< roll relative to vertical [rad]
REAL(DbKi) :: pitch !< pitch relative to vertical [rad]
REAL(DbKi) :: roll !< roll relative to vertical [deg]
REAL(DbKi) :: pitch !< pitch relative to vertical [deg]
REAL(DbKi) :: h0 !< submerged length of rod axis, distance along rod centerline from end A to the waterplane (0 <= h0 <= L) [m]
REAL(DbKi) , DIMENSION(:,:), ALLOCATABLE :: r !< node positions [-]
REAL(DbKi) , DIMENSION(:,:), ALLOCATABLE :: rd !< node velocities [-]
Expand Down Expand Up @@ -232,11 +232,11 @@ MODULE MoorDyn_Types
INTEGER(IntKi) :: ElasticMod !< Which elasticity model to use: {0 basic, 1 viscoelastic, 2 future SYCOM} [-]
INTEGER(IntKi) , DIMENSION(1:20) :: OutFlagList !< array specifying what line quantities should be output (1 vs 0) [-]
INTEGER(IntKi) :: CtrlChan = 0 !< index of control channel that will drive line active tensioning (0 for none) [-]
INTEGER(IntKi) :: FairPoint !< IdNum of point at fairlead [-]
INTEGER(IntKi) :: AnchPoint !< IdNum of point at anchor [-]
INTEGER(IntKi) :: FairPoint !< IdNum of Point at fairlead [-]
INTEGER(IntKi) :: AnchPoint !< IdNum of Point at anchor [-]
INTEGER(IntKi) :: N !< The number of elements in the line [-]
INTEGER(IntKi) :: endTypeA !< type of point at end A: 0=pinned to point, 1=cantilevered to Rod. [-]
INTEGER(IntKi) :: endTypeB !< type of point at end B: 0=pinned to point, 1=cantilevered to Rod. [-]
INTEGER(IntKi) :: endTypeA !< type of connection at end A: 0=pinned to Point, 1=cantilevered to Rod. [-]
INTEGER(IntKi) :: endTypeB !< type of connection at end B: 0=pinned to Point, 1=cantilevered to Rod. [-]
REAL(DbKi) :: UnstrLen !< unstretched length of the line [-]
REAL(DbKi) :: rho !< density [[kg/m3]]
REAL(DbKi) :: d !< volume-equivalent diameter [[m]]
Expand Down Expand Up @@ -303,7 +303,7 @@ MODULE MoorDyn_Types
CHARACTER(10) :: Units !< units string [-]
INTEGER(IntKi) :: QType !< type of quantity - 0=tension, 1=x, 2=y, 3=z... [-]
INTEGER(IntKi) :: OType !< type of object - 0=line, 1=point [-]
INTEGER(IntKi) :: NodeID !< node number if OType=0. 0=anchor, -1=Whole Object [-]
INTEGER(IntKi) :: NodeID !< node number if OType=0. 0=anchor, -1=N=Fairlead [-]
INTEGER(IntKi) :: ObjID !< number of Point or Line object [-]
END TYPE MD_OutParmType
! =======================
Expand Down Expand Up @@ -366,8 +366,8 @@ MODULE MoorDyn_Types
INTEGER(IntKi) , DIMENSION(:,:), ALLOCATABLE :: CpldBodyIs !< array of coupled body indices in BodyList vector []
INTEGER(IntKi) , DIMENSION(:), ALLOCATABLE :: LineStateIs1 !< starting index of each line's states in state vector []
INTEGER(IntKi) , DIMENSION(:), ALLOCATABLE :: LineStateIsN !< ending index of each line's states in state vector []
INTEGER(IntKi) , DIMENSION(:), ALLOCATABLE :: PointStateIs1 !< starting index of each point's states in state vector []
INTEGER(IntKi) , DIMENSION(:), ALLOCATABLE :: PointStateIsN !< ending index of each point's states in state vector []
INTEGER(IntKi) , DIMENSION(:), ALLOCATABLE :: PointStateIs1 !< starting index of each line's states in state vector []
INTEGER(IntKi) , DIMENSION(:), ALLOCATABLE :: PointStateIsN !< ending index of each line's states in state vector []
INTEGER(IntKi) , DIMENSION(:), ALLOCATABLE :: RodStateIs1 !< starting index of each rod's states in state vector []
INTEGER(IntKi) , DIMENSION(:), ALLOCATABLE :: RodStateIsN !< ending index of each rod's states in state vector []
INTEGER(IntKi) , DIMENSION(:), ALLOCATABLE :: BodyStateIs1 !< starting index of each body's states in state vector []
Expand All @@ -390,8 +390,8 @@ MODULE MoorDyn_Types
TYPE, PUBLIC :: MD_ParameterType
INTEGER(IntKi) :: nLineTypes = 0 !< number of line types []
INTEGER(IntKi) :: nRodTypes = 0 !< number of rod types []
INTEGER(IntKi) :: nPoints = 0 !< number of point objects []
INTEGER(IntKi) :: nPointsExtra = 0 !< number of point objects including space for extra ones that could arise from line failures []
INTEGER(IntKi) :: nPoints = 0 !< number of Point objects []
INTEGER(IntKi) :: nPointsExtra = 0 !< number of Point objects including space for extra ones that could arise from line failures []
INTEGER(IntKi) :: nBodies = 0 !< number of Body objects []
INTEGER(IntKi) :: nRods = 0 !< number of Rod objects []
INTEGER(IntKi) :: nLines = 0 !< number of Line objects []
Expand All @@ -403,8 +403,8 @@ MODULE MoorDyn_Types
INTEGER(IntKi) , DIMENSION(:), ALLOCATABLE :: nCpldBodies !< number of coupled bodies (for FAST.Farm, size>1 with an entry for each turbine) []
INTEGER(IntKi) , DIMENSION(:), ALLOCATABLE :: nCpldRods !< number of coupled rods (for FAST.Farm, size>1 with an entry for each turbine) []
INTEGER(IntKi) , DIMENSION(:), ALLOCATABLE :: nCpldPoints !< number of coupled points (for FAST.Farm, size>1 with an entry for each turbine) []
INTEGER(IntKi) :: NConns = 0 !< number of Connect type Connections - not to be confused with NConnects []
INTEGER(IntKi) :: NAnchs = 0 !< number of Anchor type points []
INTEGER(IntKi) :: NConns = 0 !< number of Connect type Points - not to be confused with NPoints []
INTEGER(IntKi) :: NAnchs = 0 !< number of Anchor type Points []
REAL(DbKi) :: Tmax !< simulation duration [[s]]
REAL(DbKi) :: g = 9.81 !< gravitational constant (positive) [[m/s^2]]
REAL(DbKi) :: rhoW = 1025 !< density of seawater [[kg/m^3]]
Expand Down
2 changes: 1 addition & 1 deletion modules/openfast-library/src/FAST_Types.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ MODULE FAST_Types
CHARACTER(1024) :: RootName !< Root name of FAST output files (overrides normal operation) [-]
INTEGER(IntKi) :: NumActForcePtsBlade !< number of actuator line force points in blade [-]
INTEGER(IntKi) :: NumActForcePtsTower !< number of actuator line force points in tower [-]
LOGICAL :: NodeClusterType !< Node clustering for actuator line (0 - Uniform, 1 - Non-uniform clustered towards tip) [-]
INTEGER(IntKi) :: NodeClusterType !< Node clustering for actuator line (0 - Uniform, 1 - Non-uniform clustered towards tip) [-]
END TYPE FAST_ExternInitType
! =======================
! ========= FAST_TurbineType =======
Expand Down
2 changes: 1 addition & 1 deletion reg_tests/lib/errorPlotting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def _replace_id_script(html_string, plot):
return html_string

def _save_plot(script, div, path, attribute):
div_class = ' class="col-sm-12 col-md-6 col-lg-6"'
div_class = ' class=""'

file_name = "_script".join((attribute, ".txt"))
with open(os.path.join(path, file_name), 'w') as f:
Expand Down
17 changes: 15 additions & 2 deletions vs-build/AeroDyn/AeroDyn_Driver.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.40629.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.33529.622
MinimumVisualStudioVersion = 10.0.40219.1
Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "AeroDyn_Driver", "AeroDyn_Driver.vfproj", "{97CEFEB9-1DCB-470E-A231-E1DA2F21A9CE}"
ProjectSection(ProjectDependencies) = postProject
Expand All @@ -18,6 +18,8 @@ Global
Debug|x64 = Debug|x64
Release_Double|Win32 = Release_Double|Win32
Release_Double|x64 = Release_Double|x64
Release_OpenMP|Win32 = Release_OpenMP|Win32
Release_OpenMP|x64 = Release_OpenMP|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
Expand All @@ -34,6 +36,10 @@ Global
{97CEFEB9-1DCB-470E-A231-E1DA2F21A9CE}.Release_Double|Win32.Build.0 = Release_Double|Win32
{97CEFEB9-1DCB-470E-A231-E1DA2F21A9CE}.Release_Double|x64.ActiveCfg = Release_Double|x64
{97CEFEB9-1DCB-470E-A231-E1DA2F21A9CE}.Release_Double|x64.Build.0 = Release_Double|x64
{97CEFEB9-1DCB-470E-A231-E1DA2F21A9CE}.Release_OpenMP|Win32.ActiveCfg = Release_OpenMP|Win32
{97CEFEB9-1DCB-470E-A231-E1DA2F21A9CE}.Release_OpenMP|Win32.Build.0 = Release_OpenMP|Win32
{97CEFEB9-1DCB-470E-A231-E1DA2F21A9CE}.Release_OpenMP|x64.ActiveCfg = Release_OpenMP|x64
{97CEFEB9-1DCB-470E-A231-E1DA2F21A9CE}.Release_OpenMP|x64.Build.0 = Release_OpenMP|x64
{97CEFEB9-1DCB-470E-A231-E1DA2F21A9CE}.Release|Win32.ActiveCfg = Release|Win32
{97CEFEB9-1DCB-470E-A231-E1DA2F21A9CE}.Release|Win32.Build.0 = Release|Win32
{97CEFEB9-1DCB-470E-A231-E1DA2F21A9CE}.Release|x64.ActiveCfg = Release|x64
Expand All @@ -50,6 +56,10 @@ Global
{DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release_Double|Win32.Build.0 = Release|Win32
{DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release_Double|x64.ActiveCfg = Release|Win32
{DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release_Double|x64.Build.0 = Release|Win32
{DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release_OpenMP|Win32.ActiveCfg = Release|Win32
{DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release_OpenMP|Win32.Build.0 = Release|Win32
{DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release_OpenMP|x64.ActiveCfg = Release|Win32
{DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release_OpenMP|x64.Build.0 = Release|Win32
{DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release|Win32.ActiveCfg = Release|Win32
{DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release|Win32.Build.0 = Release|Win32
{DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release|x64.ActiveCfg = Release|Win32
Expand All @@ -58,4 +68,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B3809791-8085-4B91-AC43-EB756F90F448}
EndGlobalSection
EndGlobal
Loading