Skip to content

Commit

Permalink
Merge pull request #1818 from andrew-platt/rc-3.5.1_VSprojUpdate
Browse files Browse the repository at this point in the history
VS-build updates for rc-3.5.1 and other minor updates
  • Loading branch information
andrew-platt authored Oct 19, 2023
2 parents babab1e + 396df5a commit 0ac9c84
Show file tree
Hide file tree
Showing 12 changed files with 619 additions and 485 deletions.
2 changes: 1 addition & 1 deletion docs/source/user/api_change.rst
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
1 change: 1 addition & 0 deletions modules/aerodyn/src/AeroDyn_Inflow_C_Binding.f90
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ MODULE AeroDyn_Inflow_C_BINDING


IMPLICIT NONE
SAVE

PUBLIC :: AeroDyn_Inflow_C_Init
!PUBLIC :: AeroDyn_Inflow_C_ReInit
Expand Down
36 changes: 18 additions & 18 deletions modules/moordyn/src/MoorDyn_Registry.txt
Original file line number Diff line number Diff line change
Expand Up @@ -93,18 +93,18 @@ typedef ^ ^ DbKi CaEnd -

# this is the Body type, which holds data for each body object
typedef ^ MD_Body IntKi IdNum - - - "integer identifier of this Point"
typedef ^ ^ IntKi typeNum - - - "integer identifying the type. 0=fixed, 1=vessel, 2=point"
typedef ^ ^ IntKi typeNum - - - "integer identifying the type. 0=free, 1=fixed, -1=vessel"
typedef ^ ^ IntKi AttachedC {30} - - "list of IdNums of points attached to this body"
typedef ^ ^ IntKi AttachedR {30} - - "list of IdNums of rods attached to this body"
typedef ^ ^ IntKi nAttachedC - 0 - "number of attached points"
typedef ^ ^ IntKi nAttachedR - 0 - "number of attached rods"
typedef ^ ^ DbKi rPointRel {3}{30} - - "relative position of point on body"
typedef ^ ^ DbKi r6RodRel {6}{30} - - "relative position and orientation of rod on body"
typedef ^ ^ DbKi bodyM - - - ""
typedef ^ ^ DbKi bodyV - - - ""
typedef ^ ^ DbKi bodyI {3} - - ""
typedef ^ ^ DbKi bodyCdA {6} - - "product of drag force and frontal area of point point" "[m^2]"
typedef ^ ^ DbKi bodyCa {6} - - "added mass coefficient of point point" "-"
typedef ^ ^ DbKi bodyM - - - "body mass (seperate from attached objects)" "[kg]"
typedef ^ ^ DbKi bodyV - - - "body volume (for buoyancy calculation)" "[m^3]"
typedef ^ ^ DbKi bodyI {3} - - "body 3x3 inertia matrix diagonals" "[kg-m^2]"
typedef ^ ^ DbKi bodyCdA {6} - - "product of drag force and frontal area of body" "[m^2]"
typedef ^ ^ DbKi bodyCa {6} - - "added mass coefficient of body" "-"
typedef ^ ^ DbKi time - - - "current time" "[s]"
typedef ^ ^ DbKi r6 {6} - - "position"
typedef ^ ^ DbKi v6 {6} - - "velocity"
Expand All @@ -120,19 +120,19 @@ typedef ^ ^ DbKi OrMat {3}{3}
typedef ^ ^ DbKi rCG {3} - - "vector in body frame from ref point to CG (before rods etc..)"

# this is the Point type, which holds data for each point object
typedef ^ MD_Point IntKi IdNum - - - "integer identifier of this Point"
typedef ^ ^ CHARACTER(10) type - - - "type of Point: fix, vessel, point"
typedef ^ ^ IntKi typeNum - - - "integer identifying the type. 0=fixed, 1=vessel, 2=point"
typedef ^ MD_Point IntKi IdNum - - - "integer identifier of this point"
typedef ^ ^ CHARACTER(10) type - - - "type of point: fix, vessel, point"
typedef ^ ^ IntKi typeNum - - - "integer identifying the type. 1=fixed, -1=vessel, 0=free"
typedef ^ ^ IntKi Attached {10} - - "list of IdNums of lines attached to this point node"
typedef ^ ^ IntKi Top {10} - - "list of ints specifying whether each line is attached at 1 = top/fairlead(end B), 0 = bottom/anchor(end A)"
typedef ^ ^ IntKi nAttached - 0 - "number of attached lines"
typedef ^ ^ DbKi pointM - - - ""
typedef ^ ^ DbKi pointV - - - ""
typedef ^ ^ DbKi pointM - - - "point mass" "[kg]"
typedef ^ ^ DbKi pointV - - - "point volume" "[m^3]"
typedef ^ ^ DbKi pointFX - - - ""
typedef ^ ^ DbKi pointFY - - - ""
typedef ^ ^ DbKi pointFZ - - - ""
typedef ^ ^ DbKi pointCa - - - "added mass coefficient of point point" "-"
typedef ^ ^ DbKi pointCdA - - - "product of drag force and frontal area of point point" "[m^2]"
typedef ^ ^ DbKi pointCa - - - "added mass coefficient of point" "-"
typedef ^ ^ DbKi pointCdA - - - "product of drag force and frontal area of point" "[m^2]"
typedef ^ ^ DbKi time - - - "current time" "[s]"
typedef ^ ^ DbKi r {3} - - "position"
typedef ^ ^ DbKi rd {3} - - "velocity"
Expand Down Expand Up @@ -170,8 +170,8 @@ typedef ^ ^ DbKi Cdt -
typedef ^ ^ DbKi CdEnd - - - "drag coefficient for rod end" "[-]"
typedef ^ ^ DbKi CaEnd - - - "added mass coefficient for rod end" "[-]"
typedef ^ ^ DbKi time - - - "current time" "[s]"
typedef ^ ^ DbKi roll - - - "roll relative to vertical" "deg"
typedef ^ ^ DbKi pitch - - - "pitch relative to vertical" "deg"
typedef ^ ^ DbKi roll - - - "roll relative to vertical" "[rad]"
typedef ^ ^ DbKi pitch - - - "pitch relative to vertical" "[rad]"
typedef ^ ^ DbKi h0 - - - "submerged length of rod axis, distance along rod centerline from end A to the waterplane (0 <= h0 <= L)" "m"
typedef ^ ^ DbKi r {:}{:} - - "node positions" -
typedef ^ ^ DbKi rd {:}{:} - - "node velocities" -
Expand Down Expand Up @@ -280,7 +280,7 @@ typedef ^ MD_OutParmType CHARACTER(10) Name -
typedef ^ ^ CHARACTER(10) Units - - - "units string"
typedef ^ ^ IntKi QType - - - "type of quantity - 0=tension, 1=x, 2=y, 3=z..."
typedef ^ ^ IntKi OType - - - "type of object - 0=line, 1=point"
typedef ^ ^ IntKi NodeID - - - "node number if OType=0. 0=anchor, -1=N=Fairlead"
typedef ^ ^ IntKi NodeID - - - "node number if OType=0. 0=anchor, -1=whole object"
typedef ^ ^ IntKi ObjID - - - "number of Point or Line object"

## ============================== Visualization data storage for diameter ============================================================================================================================
Expand Down Expand Up @@ -332,8 +332,8 @@ typedef ^ ^ IntKi FreeBodyIs {:}
typedef ^ ^ IntKi CpldBodyIs {:}{:} - - "array of coupled body indices in BodyList vector" ""
typedef ^ ^ IntKi LineStateIs1 {:} - - "starting index of each line's states in state vector" ""
typedef ^ ^ IntKi LineStateIsN {:} - - "ending index of each line's states in state vector" ""
typedef ^ ^ IntKi PointStateIs1 {:} - - "starting index of each line's states in state vector" ""
typedef ^ ^ IntKi PointStateIsN {:} - - "ending index of each line's states in state vector" ""
typedef ^ ^ IntKi PointStateIs1 {:} - - "starting index of each point's states in state vector" ""
typedef ^ ^ IntKi PointStateIsN {:} - - "ending index of each point's states in state vector" ""
typedef ^ ^ IntKi RodStateIs1 {:} - - "starting index of each rod's states in state vector" ""
typedef ^ ^ IntKi RodStateIsN {:} - - "ending index of each rod's states in state vector" ""
typedef ^ ^ IntKi BodyStateIs1 {:} - - "starting index of each body's states in state vector" ""
Expand Down
Loading

0 comments on commit 0ac9c84

Please sign in to comment.