diff --git a/.gitignore b/.gitignore index 0ab28e493c..7f17d22a0e 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,9 @@ build/**/* install/* ctest-build/* -vs-build +# vs-build specific folders and files +vs-build/* + + build .DS_Store diff --git a/CMakeLists.txt b/CMakeLists.txt index b4646f6775..5beacdf0a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") include(GetGitRevisionDescription) git_describe(GIT_DESCRIBE) -add_definitions(-DGIT_COMMIT_HASH="${GIT_DESCRIBE}") +add_definitions(-DGIT_VERSION_INFO="${GIT_DESCRIBE}") # CMake Configuration variables if (NOT CMAKE_BUILD_TYPE) diff --git a/modules-ext/icefloe/CMakeLists.txt b/modules-ext/icefloe/CMakeLists.txt index cd6b0a583e..252bbe3d57 100644 --- a/modules-ext/icefloe/CMakeLists.txt +++ b/modules-ext/icefloe/CMakeLists.txt @@ -19,7 +19,6 @@ generate_f90_types(src/interfaces/FAST/IceFloe_FASTRegistry.inp set(ICEFLOE_LIBS_SOURCES - src/ranlux/RANLUX.f90 src/icefloe/IceFlexBase.F90 src/icefloe/IceFlexIEC.f90 diff --git a/modules-ext/icefloe/src/icefloe/intermittentCrushing.F90 b/modules-ext/icefloe/src/icefloe/intermittentCrushing.F90 index b859b5493e..e88caf4172 100644 --- a/modules-ext/icefloe/src/icefloe/intermittentCrushing.F90 +++ b/modules-ext/icefloe/src/icefloe/intermittentCrushing.F90 @@ -53,7 +53,7 @@ subroutine initInterCrushing (iceInput, myIceParams, iceLog) call getIceInput(iceInput, 'riseTime', inParams%riseTime, iceLog, 0.1_ReKi, 0.9_ReKi) call logMessage(iceLog, ' Saw tooth rise time fraction = '//TRIM(Num2LStr(inParams%riseTime))) - call getIceInput(iceInput, 'fallTime', inParams%fallTime, iceLog, 0.1_ReKi, 1.0-inParams%riseTime) + call getIceInput(iceInput, 'fallTime', inParams%fallTime, iceLog, 0.1_ReKi, 1.0_ReKi-inParams%riseTime) call logMessage(iceLog, ' Saw tooth fall time fraction = '//TRIM(Num2LStr(inParams%fallTime))) ! get leg load phase diff --git a/modules-ext/icefloe/src/icefloe/lockInISO.F90 b/modules-ext/icefloe/src/icefloe/lockInISO.F90 index 9df7121548..ebb1e04ec3 100644 --- a/modules-ext/icefloe/src/icefloe/lockInISO.F90 +++ b/modules-ext/icefloe/src/icefloe/lockInISO.F90 @@ -76,7 +76,7 @@ subroutine initLockInCrushingISO (iceInput, myIceParams, iceLog) call logMessage(iceLog, '** Global crushing load is: '//TRIM(Num2LStr(maxLoad))//' Newtons.' ) call crushLoadTimeSeriesISO(myIceParams, inParams, iceLog, maxLoad, inParams%minLoadFraction*maxLoad, & - 1.0/inParams%twr%freq, inParams%riseTime, fallTime) + 1.0_ReKi/inParams%twr%freq, inParams%riseTime, fallTime) end subroutine initLockInCrushingISO diff --git a/modules-ext/moordyn/src/MoorDyn.f90 b/modules-ext/moordyn/src/MoorDyn.f90 index 590497100b..b0d48ef873 100644 --- a/modules-ext/moordyn/src/MoorDyn.f90 +++ b/modules-ext/moordyn/src/MoorDyn.f90 @@ -1242,9 +1242,9 @@ SUBROUTINE TimeStep ( t, dtStep, u, utimes, p, x, xd, z, other, m, ErrStat, ErrM ! step 2 - CALL MD_Input_ExtrapInterp(u, utimes, u_interp, tDbKi + 0.5*dtM, ErrStat, ErrMsg) ! interpolate input mesh to correct time (t+0.5*dtM) + CALL MD_Input_ExtrapInterp(u, utimes, u_interp, tDbKi + 0.5_ReKi*dtM, ErrStat, ErrMsg) ! interpolate input mesh to correct time (t+0.5*dtM) - CALL MD_CalcContStateDeriv( (t + 0.5*dtM), u_interp, p, x2, xd, z, other, m, dxdt, ErrStat, ErrMsg ) !called with updated states x2 and time = t + dt/2.0 + CALL MD_CalcContStateDeriv( (t + 0.5_ReKi*dtM), u_interp, p, x2, xd, z, other, m, dxdt, ErrStat, ErrMsg ) !called with updated states x2 and time = t + dt/2.0 DO J = 1, Nx x%states(J) = x%states(J) + dtM*dxdt%states(J) END DO diff --git a/modules-local/aerodyn/src/AeroDyn_Driver_Subs.f90 b/modules-local/aerodyn/src/AeroDyn_Driver_Subs.f90 index 9659129dfa..4bf4e15980 100644 --- a/modules-local/aerodyn/src/AeroDyn_Driver_Subs.f90 +++ b/modules-local/aerodyn/src/AeroDyn_Driver_Subs.f90 @@ -45,20 +45,23 @@ subroutine Dvr_Init(DvrData,errStat,errMsg ) character(*), parameter :: RoutineName = 'Dvr_Init' CHARACTER(1000) :: inputFile ! String to hold the file name. + CHARACTER(200) :: git_commit ! String containing the current git commit hash + + TYPE(ProgDesc), PARAMETER :: version = ProgDesc( 'AeroDyn Driver', '', '' ) ! The version number of this program. ErrStat = ErrID_None ErrMsg = "" + DvrData%OutFileData%unOutFile = -1 - ! Initialize the library which handle file echos and WrScr, for example - call NWTC_Init() - + CALL NWTC_Init() ! Display the copyright notice - CALL DispCopyrightLicense( version ) - + CALL DispCopyrightLicense( version ) + ! Obtain OpenFAST git commit hash + git_commit = QueryGitVersion() ! Tell our users what they're running - CALL WrScr( ' Running '//GetNVD( version )//NewLine//' linked with '//TRIM( GetNVD( NWTC_Ver ))//NewLine ) + CALL WrScr( ' Running '//GetNVD( version )//' a part of OpenFAST - '//TRIM(git_Commit)//NewLine//' linked with '//TRIM( GetNVD( NWTC_Ver ))//NewLine ) InputFile = "" ! initialize to empty string to make sure it's input from the command line CALL CheckArgs( InputFile, ErrStat2 ) diff --git a/modules-local/aerodyn/src/UnsteadyAero_Driver.f90 b/modules-local/aerodyn/src/UnsteadyAero_Driver.f90 index 9c5df802e7..cf35d88d80 100644 --- a/modules-local/aerodyn/src/UnsteadyAero_Driver.f90 +++ b/modules-local/aerodyn/src/UnsteadyAero_Driver.f90 @@ -72,7 +72,8 @@ program UnsteadyAero_Driver real(DbKi), allocatable :: timeArr(:) real(ReKi), allocatable :: AOAarr(:) real(ReKi), allocatable :: Uarr(:) !RRD - + CHARACTER(200) :: git_commit + TYPE(ProgDesc), PARAMETER :: version = ProgDesc( 'UnsteadyAero Driver', '', '' ) ! The version number of this program. ! Initialize the NWTC library call NWTC_Init() @@ -81,8 +82,15 @@ program UnsteadyAero_Driver ErrStat = ErrID_None RoutineName = 'UnsteadyAero_Driver' - - print *, 'Running UnsteadyAero_Driver' + + + ! Display the copyright notice + CALL DispCopyrightLicense( version ) + ! Obtain OpenFAST git commit hash + git_commit = QueryGitVersion() + ! Tell our users what they're running + CALL WrScr( ' Running '//GetNVD( version )//' a part of OpenFAST - '//TRIM(git_Commit)//NewLine//' linked with '//TRIM( GetNVD( NWTC_Ver ))//NewLine ) + diff --git a/modules-local/aerodyn14/src/AeroSubs.f90 b/modules-local/aerodyn14/src/AeroSubs.f90 index 26c118164b..71fd4eb2d0 100644 --- a/modules-local/aerodyn14/src/AeroSubs.f90 +++ b/modules-local/aerodyn14/src/AeroSubs.f90 @@ -2564,7 +2564,7 @@ SUBROUTINE GetTwrSectProp ( P, m, ErrStat, ErrMess, & ELSE ! There are multiple Re rows - TwrElRe = GetReynolds( VelHor, 2.0*TwrElRad, P%Wind%KinVisc ) + TwrElRe = GetReynolds( VelHor, 2.0_ReKi*TwrElRad, P%Wind%KinVisc ) IF ( p%TwrProps%NTwrCD == 1 ) THEN ! There is only one CD column TwrElCD = InterpBin( TwrElRe, p%TwrProps%TwrRe, p%TwrProps%TwrCD(:,1), N1, p%TwrProps%NTwrRe ) diff --git a/modules-local/beamdyn/src/Driver_Beam.f90 b/modules-local/beamdyn/src/Driver_Beam.f90 index e23e27b1e1..5474a67581 100644 --- a/modules-local/beamdyn/src/Driver_Beam.f90 +++ b/modules-local/beamdyn/src/Driver_Beam.f90 @@ -51,24 +51,21 @@ PROGRAM BeamDyn_Driver_Program TYPE(BD_DriverInternalType) :: DvrData - CHARACTER(256) :: DvrInputFile - CHARACTER(256) :: RootName - - ! local variables - Integer(IntKi) :: j ! counter for various loops - Integer(IntKi) :: i ! counter for various loops - - REAL(DbKi) :: TiLstPrn !< The simulation time of the last print (to file) [(s)] - REAL(ReKi) :: PrevClockTime !< Clock time at start of simulation in seconds [(s)] - REAL(ReKi) :: UsrTime1 !< User CPU time for simulation initialization [(s)] - REAL(ReKi) :: UsrTime2 !< User CPU time for simulation (without intialization) [(s)] - INTEGER(IntKi) , DIMENSION(1:8) :: StrtTime !< Start time of simulation (including intialization) [-] - INTEGER(IntKi) , DIMENSION(1:8) :: SimStrtTime !< Start time of simulation (after initialization) [-] + CHARACTER(256) :: DvrInputFile + CHARACTER(256) :: RootName + INTEGER(IntKi) :: j ! counter for various loops + INTEGER(IntKi) :: i ! counter for various loops + REAL(DbKi) :: TiLstPrn ! The simulation time of the last print (to file) [(s)] + REAL(ReKi) :: PrevClockTime ! Clock time at start of simulation in seconds [(s)] + REAL(ReKi) :: UsrTime1 ! User CPU time for simulation initialization [(s)] + REAL(ReKi) :: UsrTime2 ! User CPU time for simulation (without intialization) [(s)] + INTEGER(IntKi) , DIMENSION(1:8) :: StrtTime ! Start time of simulation (including intialization) [-] + INTEGER(IntKi) , DIMENSION(1:8) :: SimStrtTime ! Start time of simulation (after initialization) [-] + CHARACTER(200) :: git_commit ! String containing the current git commit hash - - TYPE(ProgDesc), PARAMETER :: version = ProgDesc( 'BeamDyn Driver', '', '' ) ! The version number of this program. + TYPE(ProgDesc), PARAMETER :: version = ProgDesc( 'BeamDyn Driver', '', '' ) ! The version number of this program. ! ------------------------------------------------------------------------- @@ -83,8 +80,10 @@ PROGRAM BeamDyn_Driver_Program CALL NWTC_Init() ! Display the copyright notice CALL DispCopyrightLicense( version ) + ! Obtain OpenFAST git commit hash + git_commit = QueryGitVersion() ! Tell our users what they're running - CALL WrScr( ' Running '//GetNVD( version )//NewLine//' linked with '//TRIM( GetNVD( NWTC_Ver ))//NewLine ) + CALL WrScr( ' Running '//GetNVD( version )//' a part of OpenFAST - '//TRIM(git_Commit)//NewLine//' linked with '//TRIM( GetNVD( NWTC_Ver ))//NewLine ) ! ------------------------------------------------------------------------- ! Initialization of glue-code time-step variables diff --git a/modules-local/fast-library/src/FAST_Subs.f90 b/modules-local/fast-library/src/FAST_Subs.f90 index bd4c105fff..6ad5c3b5a1 100644 --- a/modules-local/fast-library/src/FAST_Subs.f90 +++ b/modules-local/fast-library/src/FAST_Subs.f90 @@ -1279,7 +1279,9 @@ FUNCTION GetVersion(ThisProgVer) TYPE(ProgDesc), INTENT( IN ) :: ThisProgVer !< program name/date/version description CHARACTER(1024) :: GetVersion !< String containing a description of the compiled precision. - + + CHARACTER(200) :: git_commit + GetVersion = TRIM(GetNVD(ThisProgVer))//', compiled' IF ( Cmpl4SFun ) THEN ! FAST has been compiled as an S-Function for Simulink @@ -1299,22 +1301,14 @@ FUNCTION GetVersion(ThisProgVer) ELSE ! Unknown precision GetVersion = TRIM(GetVersion)//' unknown' ENDIF + ! GetVersion = TRIM(GetVersion)//' precision with '//OS_Desc GetVersion = TRIM(GetVersion)//' precision' ! add git info -#ifdef GIT_COMMIT_HASH - GetVersion = TRIM(GetVersion)//' at commit '//GIT_COMMIT_HASH -#endif -#ifdef GIT_HASH_FILE - ! VS build method for obtaining the git hash info. - ! This requires setting: - ! 1) GIT_HASH_FILE = '$(ProjectDir)\gitHash.txt' preprocessor opetion on this file. - ! 2) Creating a prebuild event on the profile file which runs this command: ..\GetGitHash.bat - ! 3) The bat file, GetGitHash.bat, located in the vs-build folder of the openfast repository, which contains the git command used to obtain the git info - GetVersion = TRIM(GetVersion)//' at commit '//ReadGitHash(GIT_HASH_FILE, errStat, errMsg) -#endif + git_commit = QueryGitVersion() + GetVersion = TRIM(GetVersion)//' at commit '//git_commit RETURN END FUNCTION GetVersion @@ -1330,17 +1324,7 @@ subroutine GetProgramMetadata(ThisProgVer, name, version, git_commit, architectu name = trim(ThisProgVer%Name) version = trim(ThisProgVer%Ver) -#ifdef GIT_COMMIT_HASH - git_commit = GIT_COMMIT_HASH -#endif -#ifdef GIT_HASH_FILE - ! VS build method for obtaining the git hash info. - ! This requires setting: - ! 1) GIT_HASH_FILE = '$(ProjectDir)\gitHash.txt' preprocessor opetion on this file. - ! 2) Creating a prebuild event on the profile file which runs this command: ..\GetGitHash.bat - ! 3) The bat file, GetGitHash.bat, located in the vs-build folder of the openfast repository, which contains the git command used to obtain the git info - git_commit = ReadGitHash(GIT_HASH_FILE, errStat, errMsg) -#endif + git_commit = QueryGitVersion() architecture = TRIM(Num2LStr(BITS_IN_ADDR))//' bit' diff --git a/modules-local/hydrodyn/src/HydroDyn_DriverCode.f90 b/modules-local/hydrodyn/src/HydroDyn_DriverCode.f90 index 81586c0628..bab48cff21 100644 --- a/modules-local/hydrodyn/src/HydroDyn_DriverCode.f90 +++ b/modules-local/hydrodyn/src/HydroDyn_DriverCode.f90 @@ -123,6 +123,11 @@ PROGRAM HydroDynDriver CHARACTER(10) :: AngleMsg ! For debugging, a string version of the largest rotation input INTEGER :: UnMeshDebug CHARACTER(50) :: MeshDebugFile + + CHARACTER(200) :: git_commit ! String containing the current git commit hash + + TYPE(ProgDesc), PARAMETER :: version = ProgDesc( 'HydroDyn Driver', '', '' ) ! The version number of this program. + !............................................................................................................................... ! Routines called in initialization !............................................................................................................................... @@ -147,8 +152,14 @@ PROGRAM HydroDynDriver ! Initialize the library which handle file echos and WrScr, for example call nwtc_init() - - IF ( command_argument_count() > 1 ) THEN + ! Display the copyright notice + CALL DispCopyrightLicense( version ) + ! Obtain OpenFAST git commit hash + git_commit = QueryGitVersion() + ! Tell our users what they're running + CALL WrScr( ' Running '//GetNVD( version )//' a part of OpenFAST - '//TRIM(git_Commit)//NewLine//' linked with '//TRIM( GetNVD( NWTC_Ver ))//NewLine ) + + IF ( command_argument_count() /= 1 ) THEN CALL print_help() STOP END IF @@ -175,6 +186,7 @@ PROGRAM HydroDynDriver call date_and_time ( Values=StrtTime ) ! Let's time the whole simulation call cpu_time ( UsrTime1 ) ! Initial time (this zeros the start time when used as a MATLAB function) SttsTime = 1.0 ! seconds + ! figure out how many time steps we should go before writing screen output: n_SttsTime = MAX( 1, NINT( SttsTime / drvrInitInp%TimeInterval ) ) ! this may not be the final TimeInterval, though!!! GJH 8/14/14 diff --git a/modules-local/nwtc-library/CMakeLists.txt b/modules-local/nwtc-library/CMakeLists.txt index a313f26bfc..c7a4439950 100644 --- a/modules-local/nwtc-library/CMakeLists.txt +++ b/modules-local/nwtc-library/CMakeLists.txt @@ -25,6 +25,9 @@ set(NWTCLIBS_SOURCES src/SingPrec.f90 src/NWTC_Library_Types.f90 + # RanLux sources + src/ranlux/RANLUX.f90 + # NetLib sources src/NetLib/Dierckx_FitPack/dierckx_fitpack.f src/NetLib/fftpack/fftpack4.1.f diff --git a/modules-local/nwtc-library/src/NWTC_IO.f90 b/modules-local/nwtc-library/src/NWTC_IO.f90 index 1b98b4286a..b8137cc645 100644 --- a/modules-local/nwtc-library/src/NWTC_IO.f90 +++ b/modules-local/nwtc-library/src/NWTC_IO.f90 @@ -4416,6 +4416,56 @@ SUBROUTINE ProgWarn ( Message ) RETURN END SUBROUTINE ProgWarn + +!======================================================================= +!> This routine outputs the git hash associate with the current codebase. + FUNCTION QueryGitVersion() + + ! Passed variables. + + !INTEGER(IntKi), INTENT(OUT) :: ErrStat ! Error status + !CHARACTER(*), INTENT(OUT) :: ErrMsg ! Error message + + ! Function declaration. + + CHARACTER(200) :: QueryGitVersion ! This function. + + ! Local variables. + + INTEGER(IntKi) :: UnIn ! Unit number for reading file + INTEGER(IntKi) :: ErrStat2 ! Temporary Error status + CHARACTER(ErrMsgLen) :: ErrMsg2 ! Temporary Error message + + !ErrStat = ErrID_None + !ErrMsg = '' + + QueryGitVersion = 'unversioned' + + ! VS build method for obtaining the git version info. + ! This requires setting: + ! 1) GIT_INCLUDE_FILE = '$(ProjectDir)\..\gitVersionInfo.h' preprocessor option on this file or the project containing this file. + ! 2) Creating a prebuild event on the project file producing the resulting binary (i.e., FAST.exe) with the following command: ..\CreateGitVersion.bat + ! 3) The bat file, CreateGitVersion.bat, located in the vs-build folder of the openfast repository, which contains the git command used to obtain the git info + ! @ECHO off + ! SET IncludeFile=..\gitVersionInfo.h + ! + ! %IncludeFile% + ! FOR /f %%a IN ('git describe --abbrev^=7 --always --tags --dirty') DO > %IncludeFile% + ! ECHO '>> %IncludeFile% + ! EXIT /B 0 + ! This creates the gitVersionInfo.h file in the vs-build folder + +#ifdef GIT_INCLUDE_FILE +#include GIT_INCLUDE_FILE +#endif + +#ifdef GIT_VERSION_INFO +QueryGitVersion = GIT_VERSION_INFO +#endif + + RETURN + END FUNCTION QueryGitVersion + !======================================================================= !> \copydoc nwtc_io::int2lstr FUNCTION R2LStr4 ( Num ) diff --git a/modules-ext/icefloe/src/ranlux/RANLUX.f90 b/modules-local/nwtc-library/src/ranlux/RANLUX.f90 similarity index 100% rename from modules-ext/icefloe/src/ranlux/RANLUX.f90 rename to modules-local/nwtc-library/src/ranlux/RANLUX.f90 diff --git a/modules-local/subdyn/src/SubDyn.f90 b/modules-local/subdyn/src/SubDyn.f90 index 7652c56a4b..7be21bd0bc 100644 --- a/modules-local/subdyn/src/SubDyn.f90 +++ b/modules-local/subdyn/src/SubDyn.f90 @@ -3105,7 +3105,7 @@ SUBROUTINE EigenSolve(K, M, nDOF, NOmega, Reduced, Init,p, Phi, Omega, ErrStat, CHARACTER(*), INTENT( OUT) :: ErrMsg ! Error message if ErrStat /= ErrID_None ! LOCALS - REAL(ReKi), ALLOCATABLE :: Omega2(:) !RRD: Eigen-values new system + REAL(LAKi), ALLOCATABLE :: Omega2(:) !RRD: Eigen-values new system ! note: SGGEV seems to have memory issues in certain cases. The eigenvalues seem to be okay, but the eigenvectors vary wildly with different compiling options. ! DGGEV seems to work better, so I'm making these variables LAKi (which is set to R8Ki for now) - bjj 4/25/2014 REAL(LAKi), ALLOCATABLE :: Kred(:,:), Mred(:,:) diff --git a/modules-local/subdyn/src/SubDyn_Driver.f90 b/modules-local/subdyn/src/SubDyn_Driver.f90 index 491ef352c2..450911ebb3 100644 --- a/modules-local/subdyn/src/SubDyn_Driver.f90 +++ b/modules-local/subdyn/src/SubDyn_Driver.f90 @@ -51,47 +51,48 @@ PROGRAM TestSubDyn ! Program variables - REAL(DbKi) :: Time ! Variable for storing time, in seconds - REAL(DbKi) :: TimeInterval ! Interval between time steps, in seconds - REAL(DbKi) :: InputTime(NumInp) ! Variable for storing time associated with inputs, in seconds + REAL(DbKi) :: Time ! Variable for storing time, in seconds + REAL(DbKi) :: TimeInterval ! Interval between time steps, in seconds + REAL(DbKi) :: InputTime(NumInp) ! Variable for storing time associated with inputs, in seconds - TYPE(SD_InitInputType) :: InitInData ! Input data for initialization - TYPE(SD_InitOutputType) :: InitOutData ! Output data from initialization + TYPE(SD_InitInputType) :: InitInData ! Input data for initialization + TYPE(SD_InitOutputType) :: InitOutData ! Output data from initialization - TYPE(SD_ContinuousStateType) :: x ! Continuous states - TYPE(SD_DiscreteStateType) :: xd ! Discrete states - TYPE(SD_ConstraintStateType) :: z ! Constraint states - TYPE(SD_OtherStateType) :: OtherState ! Other states - TYPE(SD_MiscVarType) :: m ! Misc/optimization variables + TYPE(SD_ContinuousStateType) :: x ! Continuous states + TYPE(SD_DiscreteStateType) :: xd ! Discrete states + TYPE(SD_ConstraintStateType) :: z ! Constraint states + TYPE(SD_OtherStateType) :: OtherState ! Other states + TYPE(SD_MiscVarType) :: m ! Misc/optimization variables - TYPE(SD_ParameterType) :: p ! Parameters - TYPE(SD_InputType) :: u(NumInp) ! System inputs - TYPE(SD_OutputType) :: y ! System outputs + TYPE(SD_ParameterType) :: p ! Parameters + TYPE(SD_InputType) :: u(NumInp) ! System inputs + TYPE(SD_OutputType) :: y ! System outputs - INTEGER(IntKi) :: n ! Loop counter (for time step) - INTEGER(IntKi) :: ErrStat, ErrStat1, ErrStat2, ErrStat3 ! Status of error message - CHARACTER(1024) :: ErrMsg, ErrMsg1, ErrMsg2, ErrMsg3 ! Error message if ErrStat /= ErrID_None + INTEGER(IntKi) :: n ! Loop counter (for time step) + INTEGER(IntKi) :: ErrStat, ErrStat1, ErrStat2, ErrStat3 ! Status of error message + CHARACTER(1024) :: ErrMsg, ErrMsg1, ErrMsg2, ErrMsg3 ! Error message if ErrStat /= ErrID_None - CHARACTER(1024) :: drvrFilename ! Filename and path for the driver input file. This is passed in as a command line argument when running the Driver exe. - TYPE(SD_Drvr_InitInput) :: drvrInitInp ! Initialization data for the driver program - INTEGER(IntKi) :: UnInp ! Inputs file identifier - INTEGER(IntKi) :: UnSD_Out ! Output file identifier - REAL(ReKi), ALLOCATABLE :: SDin(:,:) ! Variable for storing time, forces, and body velocities, in m/s or rad/s for SubDyn inputs - INTEGER(IntKi) :: J ! Generic loop counter - REAL(ReKi) :: dcm (3,3) ! The resulting transformation matrix from X to x, (-). - REAL(DbKi) :: maxAngle ! For debugging, see what the largest rotational angle input is for the simulation - CHARACTER(10) :: AngleMsg ! For debugging, a string version of the largest rotation input + CHARACTER(1024) :: drvrFilename ! Filename and path for the driver input file. This is passed in as a command line argument when running the Driver exe. + TYPE(SD_Drvr_InitInput) :: drvrInitInp ! Initialization data for the driver program + INTEGER(IntKi) :: UnInp ! Inputs file identifier + INTEGER(IntKi) :: UnSD_Out ! Output file identifier + REAL(ReKi), ALLOCATABLE :: SDin(:,:) ! Variable for storing time, forces, and body velocities, in m/s or rad/s for SubDyn inputs + INTEGER(IntKi) :: J ! Generic loop counter + REAL(ReKi) :: dcm (3,3) ! The resulting transformation matrix from X to x, (-). + REAL(DbKi) :: maxAngle ! For debugging, see what the largest rotational angle input is for the simulation + CHARACTER(10) :: AngleMsg ! For debugging, a string version of the largest rotation input ! Other/Misc variables - REAL(DbKi) :: TiLstPrn ! The time of the last print - REAL(DbKi) :: TMax - REAL(DbKi) :: OutTime ! Used to determine if output should be generated at this simulation time - REAL(ReKi) :: PrevClockTime ! Clock time at start of simulation in seconds - REAL :: UsrTime1 ! User CPU time for simulation initialization - INTEGER :: StrtTime (8) ! Start time of simulation - + REAL(DbKi) :: TiLstPrn ! The time of the last print + REAL(DbKi) :: TMax + REAL(DbKi) :: OutTime ! Used to determine if output should be generated at this simulation time + REAL(ReKi) :: PrevClockTime ! Clock time at start of simulation in seconds + REAL :: UsrTime1 ! User CPU time for simulation initialization + INTEGER :: StrtTime (8) ! Start time of simulation + CHARACTER(200) :: git_commit ! String containing the current git commit hash + TYPE(ProgDesc), PARAMETER :: version = ProgDesc( 'SubDyn Driver', '', '' ) ! The version number of this program. !............................................................................................................................... ! Routines called in initialization !............................................................................................................................... @@ -110,6 +111,15 @@ PROGRAM TestSubDyn CALL NWTC_Init( ) + ! Display the copyright notice + CALL DispCopyrightLicense( version ) + ! Obtain OpenFAST git commit hash + git_commit = QueryGitVersion() + ! Tell our users what they're running + CALL WrScr( ' Running '//GetNVD( version )//' a part of OpenFAST - '//TRIM(git_Commit)//NewLine//' linked with '//TRIM( GetNVD( NWTC_Ver ))//NewLine ) + + + ! Set the abort error level to a fatal error AbortErrLev = ErrID_Fatal diff --git a/vs-build/AFI/AFI-w-registry.sln b/vs-build/AFI/AFI-w-registry.sln new file mode 100644 index 0000000000..89d0fec855 --- /dev/null +++ b/vs-build/AFI/AFI-w-registry.sln @@ -0,0 +1,61 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.40629.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "AFI", "AFI.vfproj", "{2854302F-A93D-4C22-9329-717B085113C0}" + ProjectSection(ProjectDependencies) = postProject + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16} = {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FAST_Registry", "..\Registry\FAST_Registry.vcxproj", "{DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_Double|Win32 = Debug_Double|Win32 + Debug_Double|x64 = Debug_Double|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release_Double|Win32 = Release_Double|Win32 + Release_Double|x64 = Release_Double|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2854302F-A93D-4C22-9329-717B085113C0}.Debug_Double|Win32.ActiveCfg = Debug_Double|Win32 + {2854302F-A93D-4C22-9329-717B085113C0}.Debug_Double|Win32.Build.0 = Debug_Double|Win32 + {2854302F-A93D-4C22-9329-717B085113C0}.Debug_Double|x64.ActiveCfg = Debug_Double|x64 + {2854302F-A93D-4C22-9329-717B085113C0}.Debug_Double|x64.Build.0 = Debug_Double|x64 + {2854302F-A93D-4C22-9329-717B085113C0}.Debug|Win32.ActiveCfg = Debug|Win32 + {2854302F-A93D-4C22-9329-717B085113C0}.Debug|Win32.Build.0 = Debug|Win32 + {2854302F-A93D-4C22-9329-717B085113C0}.Debug|x64.ActiveCfg = Debug|x64 + {2854302F-A93D-4C22-9329-717B085113C0}.Debug|x64.Build.0 = Debug|x64 + {2854302F-A93D-4C22-9329-717B085113C0}.Release_Double|Win32.ActiveCfg = Release_Double|Win32 + {2854302F-A93D-4C22-9329-717B085113C0}.Release_Double|Win32.Build.0 = Release_Double|Win32 + {2854302F-A93D-4C22-9329-717B085113C0}.Release_Double|x64.ActiveCfg = Release_Double|x64 + {2854302F-A93D-4C22-9329-717B085113C0}.Release_Double|x64.Build.0 = Release_Double|x64 + {2854302F-A93D-4C22-9329-717B085113C0}.Release|Win32.ActiveCfg = Release|Win32 + {2854302F-A93D-4C22-9329-717B085113C0}.Release|Win32.Build.0 = Release|Win32 + {2854302F-A93D-4C22-9329-717B085113C0}.Release|x64.ActiveCfg = Release|x64 + {2854302F-A93D-4C22-9329-717B085113C0}.Release|x64.Build.0 = Release|x64 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Debug_Double|Win32.ActiveCfg = Debug-Double Precision|Win32 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Debug_Double|Win32.Build.0 = Debug-Double Precision|Win32 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Debug_Double|x64.ActiveCfg = Debug-Double Precision|x64 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Debug_Double|x64.Build.0 = Debug-Double Precision|x64 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Debug|Win32.ActiveCfg = Debug|Win32 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Debug|Win32.Build.0 = Debug|Win32 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Debug|x64.ActiveCfg = Debug|x64 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Debug|x64.Build.0 = Debug|x64 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release_Double|Win32.ActiveCfg = Release-Double Precision|Win32 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release_Double|Win32.Build.0 = Release-Double Precision|Win32 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release_Double|x64.ActiveCfg = Release-Double Precision|x64 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release_Double|x64.Build.0 = Release-Double Precision|x64 + {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|x64 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/vs-build/AeroDyn/AeroDyn_Driver.vfproj b/vs-build/AeroDyn/AeroDyn_Driver.vfproj index 2cc0869103..325ea7bad4 100644 --- a/vs-build/AeroDyn/AeroDyn_Driver.vfproj +++ b/vs-build/AeroDyn/AeroDyn_Driver.vfproj @@ -5,83 +5,83 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -214,18 +214,30 @@ - + - + + + - + - + - + - - + + + + + + + + + + + + diff --git a/vs-build/BeamDyn/BeamDyn-w-registry.sln b/vs-build/BeamDyn/BeamDyn-w-registry.sln new file mode 100644 index 0000000000..a881f9d525 --- /dev/null +++ b/vs-build/BeamDyn/BeamDyn-w-registry.sln @@ -0,0 +1,61 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.40629.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "BeamDyn", "BeamDyn.vfproj", "{815C302F-A93D-4C22-9329-7112345113C0}" + ProjectSection(ProjectDependencies) = postProject + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16} = {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FAST_Registry", "..\Registry\FAST_Registry.vcxproj", "{DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_Double|Win32 = Debug_Double|Win32 + Debug_Double|x64 = Debug_Double|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release_Double|Win32 = Release_Double|Win32 + Release_Double|x64 = Release_Double|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {815C302F-A93D-4C22-9329-7112345113C0}.Debug_Double|Win32.ActiveCfg = Debug_Double|Win32 + {815C302F-A93D-4C22-9329-7112345113C0}.Debug_Double|Win32.Build.0 = Debug_Double|Win32 + {815C302F-A93D-4C22-9329-7112345113C0}.Debug_Double|x64.ActiveCfg = Debug_Double|x64 + {815C302F-A93D-4C22-9329-7112345113C0}.Debug_Double|x64.Build.0 = Debug_Double|x64 + {815C302F-A93D-4C22-9329-7112345113C0}.Debug|Win32.ActiveCfg = Debug|Win32 + {815C302F-A93D-4C22-9329-7112345113C0}.Debug|Win32.Build.0 = Debug|Win32 + {815C302F-A93D-4C22-9329-7112345113C0}.Debug|x64.ActiveCfg = Debug|x64 + {815C302F-A93D-4C22-9329-7112345113C0}.Debug|x64.Build.0 = Debug|x64 + {815C302F-A93D-4C22-9329-7112345113C0}.Release_Double|Win32.ActiveCfg = Release_Double|Win32 + {815C302F-A93D-4C22-9329-7112345113C0}.Release_Double|Win32.Build.0 = Release_Double|Win32 + {815C302F-A93D-4C22-9329-7112345113C0}.Release_Double|x64.ActiveCfg = Release_Double|x64 + {815C302F-A93D-4C22-9329-7112345113C0}.Release_Double|x64.Build.0 = Release_Double|x64 + {815C302F-A93D-4C22-9329-7112345113C0}.Release|Win32.ActiveCfg = Release|Win32 + {815C302F-A93D-4C22-9329-7112345113C0}.Release|Win32.Build.0 = Release|Win32 + {815C302F-A93D-4C22-9329-7112345113C0}.Release|x64.ActiveCfg = Release|x64 + {815C302F-A93D-4C22-9329-7112345113C0}.Release|x64.Build.0 = Release|x64 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Debug_Double|Win32.ActiveCfg = Debug-Double Precision|Win32 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Debug_Double|Win32.Build.0 = Debug-Double Precision|Win32 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Debug_Double|x64.ActiveCfg = Debug-Double Precision|x64 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Debug_Double|x64.Build.0 = Debug-Double Precision|x64 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Debug|Win32.ActiveCfg = Debug|Win32 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Debug|Win32.Build.0 = Debug|Win32 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Debug|x64.ActiveCfg = Debug|x64 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Debug|x64.Build.0 = Debug|x64 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release_Double|Win32.ActiveCfg = Release-Double Precision|Win32 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release_Double|Win32.Build.0 = Release-Double Precision|Win32 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release_Double|x64.ActiveCfg = Release-Double Precision|x64 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release_Double|x64.Build.0 = Release-Double Precision|x64 + {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|x64 + {DA16A3A6-3297-4628-9E46-C6FA0E3C4D16}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/vs-build/BeamDyn/BeamDyn.vfproj b/vs-build/BeamDyn/BeamDyn.vfproj new file mode 100644 index 0000000000..9d373a520b --- /dev/null +++ b/vs-build/BeamDyn/BeamDyn.vfproj @@ -0,0 +1,293 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vs-build/CreateGitVersion.bat b/vs-build/CreateGitVersion.bat new file mode 100644 index 0000000000..15b2147b8f --- /dev/null +++ b/vs-build/CreateGitVersion.bat @@ -0,0 +1,7 @@ +@ECHO off +SET IncludeFile=..\gitVersionInfo.h + + %IncludeFile% +FOR /f %%a IN ('git describe --abbrev^=8 --always --tags --dirty') DO > %IncludeFile% +ECHO '>> %IncludeFile% +EXIT /B 0 \ No newline at end of file diff --git a/vs-build/Discon/Discon.sln b/vs-build/Discon/Discon.sln new file mode 100644 index 0000000000..06867c12e7 --- /dev/null +++ b/vs-build/Discon/Discon.sln @@ -0,0 +1,48 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.40629.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "Discon", "Discon.vfproj", "{183CC593-AD4C-4A15-81C1-7D6D20A9A5ED}" +EndProject +Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "Discon_ITIBarge", "Discon_ITIBarge.vfproj", "{11A28263-1385-47DF-9122-30BF9C0DF013}" +EndProject +Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "Discon_OC3Hywind", "Discon_OC3Hywind.vfproj", "{3BA7CEDE-8D58-4D18-8A59-A4114FB70B9C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {183CC593-AD4C-4A15-81C1-7D6D20A9A5ED}.Debug|Win32.ActiveCfg = Debug|Win32 + {183CC593-AD4C-4A15-81C1-7D6D20A9A5ED}.Debug|Win32.Build.0 = Debug|Win32 + {183CC593-AD4C-4A15-81C1-7D6D20A9A5ED}.Debug|x64.ActiveCfg = Debug|Win32 + {183CC593-AD4C-4A15-81C1-7D6D20A9A5ED}.Debug|x64.Build.0 = Debug|Win32 + {183CC593-AD4C-4A15-81C1-7D6D20A9A5ED}.Release|Win32.ActiveCfg = Release|x64 + {183CC593-AD4C-4A15-81C1-7D6D20A9A5ED}.Release|Win32.Build.0 = Release|x64 + {183CC593-AD4C-4A15-81C1-7D6D20A9A5ED}.Release|x64.ActiveCfg = Release|x64 + {183CC593-AD4C-4A15-81C1-7D6D20A9A5ED}.Release|x64.Build.0 = Release|x64 + {11A28263-1385-47DF-9122-30BF9C0DF013}.Debug|Win32.ActiveCfg = Debug|Win32 + {11A28263-1385-47DF-9122-30BF9C0DF013}.Debug|Win32.Build.0 = Debug|Win32 + {11A28263-1385-47DF-9122-30BF9C0DF013}.Debug|x64.ActiveCfg = Debug|x64 + {11A28263-1385-47DF-9122-30BF9C0DF013}.Debug|x64.Build.0 = Debug|x64 + {11A28263-1385-47DF-9122-30BF9C0DF013}.Release|Win32.ActiveCfg = Release|Win32 + {11A28263-1385-47DF-9122-30BF9C0DF013}.Release|Win32.Build.0 = Release|Win32 + {11A28263-1385-47DF-9122-30BF9C0DF013}.Release|x64.ActiveCfg = Release|x64 + {11A28263-1385-47DF-9122-30BF9C0DF013}.Release|x64.Build.0 = Release|x64 + {3BA7CEDE-8D58-4D18-8A59-A4114FB70B9C}.Debug|Win32.ActiveCfg = Debug|Win32 + {3BA7CEDE-8D58-4D18-8A59-A4114FB70B9C}.Debug|Win32.Build.0 = Debug|Win32 + {3BA7CEDE-8D58-4D18-8A59-A4114FB70B9C}.Debug|x64.ActiveCfg = Debug|x64 + {3BA7CEDE-8D58-4D18-8A59-A4114FB70B9C}.Debug|x64.Build.0 = Debug|x64 + {3BA7CEDE-8D58-4D18-8A59-A4114FB70B9C}.Release|Win32.ActiveCfg = Release|Win32 + {3BA7CEDE-8D58-4D18-8A59-A4114FB70B9C}.Release|Win32.Build.0 = Release|Win32 + {3BA7CEDE-8D58-4D18-8A59-A4114FB70B9C}.Release|x64.ActiveCfg = Release|x64 + {3BA7CEDE-8D58-4D18-8A59-A4114FB70B9C}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/vs-build/Discon/Discon.vfproj b/vs-build/Discon/Discon.vfproj new file mode 100644 index 0000000000..f5aa5a7240 --- /dev/null +++ b/vs-build/Discon/Discon.vfproj @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vs-build/Discon/Discon_ITIBarge.vfproj b/vs-build/Discon/Discon_ITIBarge.vfproj new file mode 100644 index 0000000000..1f8076ce5c --- /dev/null +++ b/vs-build/Discon/Discon_ITIBarge.vfproj @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vs-build/Discon/Discon_OC3Hywind.vfproj b/vs-build/Discon/Discon_OC3Hywind.vfproj new file mode 100644 index 0000000000..ec999145a1 --- /dev/null +++ b/vs-build/Discon/Discon_OC3Hywind.vfproj @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vs-build/FAST/FAST.vfproj b/vs-build/FAST/FAST.vfproj index b2c96558b2..39fed180f6 100644 --- a/vs-build/FAST/FAST.vfproj +++ b/vs-build/FAST/FAST.vfproj @@ -4,84 +4,84 @@ - + - + - + - + - + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - + - + - + diff --git a/vs-build/FASTlib/FASTlib.vfproj b/vs-build/FASTlib/FASTlib.vfproj index 88d803b764..7b178596f4 100644 --- a/vs-build/FASTlib/FASTlib.vfproj +++ b/vs-build/FASTlib/FASTlib.vfproj @@ -5,7 +5,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -32,16 +32,16 @@ - + - + - + @@ -50,7 +50,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -104,11 +104,11 @@ - + - + @@ -716,8 +716,6 @@ - - @@ -1222,6 +1220,8 @@ + + diff --git a/vs-build/GetGitHash.bat b/vs-build/GetGitHash.bat new file mode 100644 index 0000000000..ff44967bcc --- /dev/null +++ b/vs-build/GetGitHash.bat @@ -0,0 +1 @@ +git describe --abbrev=8 --dirty --tags > ..\githash.txt diff --git a/vs-build/HydroDyn/HydroDynDriver.vfproj b/vs-build/HydroDyn/HydroDynDriver.vfproj index b23e27b5ae..8a5aefadc4 100644 --- a/vs-build/HydroDyn/HydroDynDriver.vfproj +++ b/vs-build/HydroDyn/HydroDynDriver.vfproj @@ -5,43 +5,43 @@ - + - + - + - + - + - + - + - + diff --git a/vs-build/SubDyn/SubDyn.vfproj b/vs-build/SubDyn/SubDyn.vfproj index dfcf1f8f5d..7a6f60baac 100644 --- a/vs-build/SubDyn/SubDyn.vfproj +++ b/vs-build/SubDyn/SubDyn.vfproj @@ -5,43 +5,43 @@ - + - + - + - + - - + + - + - - + + - + diff --git a/vs-build/UnsteadyAero/UnsteadyAero.vfproj b/vs-build/UnsteadyAero/UnsteadyAero.vfproj index dab97e9924..49d448e13c 100644 --- a/vs-build/UnsteadyAero/UnsteadyAero.vfproj +++ b/vs-build/UnsteadyAero/UnsteadyAero.vfproj @@ -5,83 +5,83 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -97,214 +97,222 @@ - - + + - - + + - + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +