Merge remote-tracking branch 'ebranlard/f/flexsub2' into f/SlD_NoJaco…

…bian
OpenFAST · andrew-platt · Jan 29, 2020 · Jan 30, 2020 · Jan 30, 2020 · Jan 30, 2020
commit cc7e34cf6b29dd57261d62620f7e47405b756828
diff --git a/.github/actions/compile-and-test/entrypoint.sh b/.github/actions/compile-and-test/entrypoint.sh
@@ -1,17 +1,31 @@
 #!/bin/bash
 
+cd /openfast
+
 git fetch origin ${GITHUB_REF}:CI
 git checkout CI
 git submodule update
 
-# Print the current git info
-echo `git status`
-echo `git log -1`
+# Display the current git info
+echo git-status from openfast:
+git status
+
+echo git-log from openfast:
+git log -1
+
 cd /openfast/reg_tests/r-test
-echo `git status`
-echo `git log -1`
+echo git-status from r-test:
+git status
+
+echo git-log from r-test:
+git log -1
+
 cd /openfast
 
+# Display the differences between this commit and `dev`
+echo git-diff from ${GITHUB_REF} to dev:
+git diff dev
+
 # Move into the "build" directory, remove the old reg tests, and compile
 cd /openfast/build
 rm -rf reg_tests

diff --git a/.travis.yml b/.travis.yml
@@ -9,8 +9,8 @@ packages: g++-8
 sudo: true
 
 before_install:
-      # linux configuration
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install g++-8 gfortran-8 libblas-dev liblapack3 liblapack-dev; fi
+    # linux configuration
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install gfortran libblas-dev liblapack-dev; fi
     - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CPP_API" == "ON" ]]; then sudo apt-get install libopenmpi-dev libyaml-cpp-dev libhdf5-dev libxml2-dev; fi
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pyenv shell 3.7.1; fi
     - apt-cache policy libblas-dev

diff --git a/Makefile b/Makefile
diff --git a/README.rst b/README.rst
@@ -114,12 +114,6 @@ Details for compiling
 `developing <http://openfast.readthedocs.io/en/latest/source/dev/index.html>`_
 OpenFAST on Unix-based and Windows machines are available at `readthedocs <http://openfast.readthedocs.io>`_.
 
-Nightly Testing
----------------
-The ``dev`` branch is automatically compiled and run through the test suite
-nightly. The results are publicly available through the
-`CDash Dashboard <http://my.cdash.org/index.php?project=OpenFAST&date=>`_.
-
 Help
 ----
 Please use `github issues <https://github.com/OpenFAST/OpenFAST/issues>`_ to:

diff --git a/cmake/OpenfastFortranOptions.cmake b/cmake/OpenfastFortranOptions.cmake
@@ -93,7 +93,7 @@ macro(set_fast_gfortran)
 
   # debug flags
   if(CMAKE_BUILD_TYPE MATCHES Debug)
-    set( CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -fcheck=all -pedantic -fbacktrace" )
+    set( CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} " )
   endif()
 
   if(CYGWIN)

diff --git a/docs/index.rst b/docs/index.rst
@@ -42,7 +42,6 @@ package:
 
 - `OpenFAST Github Organization <https://github.com/OpenFAST>`_
 - `Github Repository <https://github.com/OpenFAST/OpenFAST>`_
-- `Nightly Tests <http://my.cdash.org/index.php?project=OpenFAST>`_
 
 **Documentation Directory**
 

diff --git a/docs/source/testing/regression_test.rst b/docs/source/testing/regression_test.rst
@@ -65,7 +65,7 @@ Dependencies
 ------------
 The following packages are required for regression testing:
 
-- Python 3+
+- Python 3.7+
 - Numpy
 - CMake and CTest (Optional)
 - Bokeh 1.4 (Optional)

diff --git a/docs/source/testing/unit_test.rst b/docs/source/testing/unit_test.rst
@@ -21,7 +21,7 @@ Dependencies
 ------------
 The following packages are required for unit testing:
 
-- Python 3+
+- Python 3.7+
 - CMake
 - pFUnit - Included in OpenFAST repo through a git-submodule
 

diff --git a/glue-codes/openfast-cpp/src/OpenFAST.cpp b/glue-codes/openfast-cpp/src/OpenFAST.cpp
@@ -232,7 +232,7 @@ void fast::OpenFAST::step() {
      // this advances the states, calls CalcOutput, and solves for next inputs. Predictor-corrector loop is imbeded here:
      // (note OpenFOAM could do subcycling around this step)
 
-     //writeVelocityData(velNodeDataFile, iTurb, nt_global, cDriver_Input_from_FAST[iTurb], cDriver_Output_to_FAST[iTurb]);
+     writeVelocityData(velNodeDataFile, iTurb, nt_global, cDriver_Input_from_FAST[iTurb], cDriver_Output_to_FAST[iTurb]);
 
      if ( isDebug() ) {
 

diff --git a/glue-codes/openfast/src/FAST_Prog.f90 b/glue-codes/openfast/src/FAST_Prog.f90
@@ -63,12 +63,13 @@ PROGRAM FAST
 
    CALL CheckArgs( InputFile, Flag=FlagArg, Arg2=CheckpointRoot )
 
-   IF ( TRIM(FlagArg) == 'H' ) THEN ! Exit after help prompt
-      CALL NormStop()
-
-   ELSE IF ( TRIM(FlagArg) == 'RESTART' ) THEN ! Restart from checkpoint file
+   IF ( TRIM(FlagArg) == 'RESTART' ) THEN ! Restart from checkpoint file
       CALL FAST_RestoreFromCheckpoint_Tary(t_initial, Restart_step, Turbine, CheckpointRoot, ErrStat, ErrMsg  )
          CALL CheckError( ErrStat, ErrMsg, 'during restore from checkpoint'  )            
+
+   ELSEIF ( LEN( TRIM(FlagArg) ) > 0 ) THEN ! Any other flag, end normally
+      CALL NormStop()
+
    ELSE
       Restart_step = 0
 

diff --git a/modules/aerodyn/src/AeroDyn_Driver_Subs.f90 b/modules/aerodyn/src/AeroDyn_Driver_Subs.f90
@@ -44,39 +44,27 @@ subroutine Dvr_Init(DvrData,errStat,errMsg )
 
    CHARACTER(1000)                             :: inputFile     ! String to hold the file name.
    CHARACTER(200)                              :: git_commit    ! String containing the current git commit hash
+   CHARACTER(20)                               :: FlagArg       ! flag argument from command line
 
-   TYPE(ProgDesc), PARAMETER                   :: version   = ProgDesc( 'AeroDyn Driver', '', '' )  ! The version number of this program.
 
    ErrStat = ErrID_None
    ErrMsg  = ""
 
 
    DvrData%OutFileData%unOutFile   = -1
 
-   CALL NWTC_Init()
+   CALL NWTC_Init( ProgNameIN=version%Name )
+
+   InputFile = ""  ! initialize to empty string to make sure it's input from the command line
+   CALL CheckArgs( InputFile, Flag=FlagArg )
+   IF ( LEN( TRIM(FlagArg) ) > 0 ) CALL NormStop()
+
       ! Display the copyright notice
-   CALL DispCopyrightLicense( version )   
+   CALL DispCopyrightLicense( version%Name )
       ! 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 )
-
-   InputFile = ""  ! initialize to empty string to make sure it's input from the command line
-   CALL CheckArgs( InputFile, ErrStat2 )
-   IF (LEN_TRIM(InputFile) == 0) THEN ! no input file was specified
-      call SetErrStat(ErrID_Fatal, 'The required input file was not specified on the command line.', ErrStat, ErrMsg, RoutineName) 
-
-         !bjj:  if people have compiled themselves, they should be able to figure out the file name, right?         
-      IF (BITS_IN_ADDR==32) THEN
-         CALL NWTC_DisplaySyntax( InputFile, 'AeroDyn_Driver_Win32.exe' )
-      ELSEIF( BITS_IN_ADDR == 64) THEN
-         CALL NWTC_DisplaySyntax( InputFile, 'AeroDyn_Driver_x64.exe' )
-      ELSE
-         CALL NWTC_DisplaySyntax( InputFile, 'AeroDyn_Driver.exe' )
-      END IF
-
-      return
-   END IF        
+   CALL WrScr( ' Running '//TRIM( version%Name )//' a part of OpenFAST - '//TRIM(git_Commit)//NewLine//' linked with '//TRIM( NWTC_Ver%Name )//NewLine )
 
       ! Read the AeroDyn driver input file
    call Dvr_ReadInputFile(inputFile, DvrData, errStat2, errMsg2 )
@@ -642,7 +630,7 @@ subroutine Dvr_InitializeOutputFile( iCase, CaseData, OutFileData, errStat, errM
       call OpenFOutFile ( OutFileData%unOutFile, trim(outFileData%Root)//'.'//trim(num2lstr(iCase))//'.out', ErrStat, ErrMsg )
          if ( ErrStat >= AbortErrLev ) return
 
-      write (OutFileData%unOutFile,'(/,A)')  'Predictions were generated on '//CurDate()//' at '//CurTime()//' using '//trim(GetNVD(version))
+      write (OutFileData%unOutFile,'(/,A)')  'Predictions were generated on '//CurDate()//' at '//CurTime()//' using '//trim( version%Name )
       write (OutFileData%unOutFile,'(1X,A)') trim(GetNVD(OutFileData%AD_ver))
       write (OutFileData%unOutFile,'()' )    !print a blank line
      ! write (OutFileData%unOutFile,'(A,11(1x,A,"=",ES11.4e2,1x,A))'   ) 'Case '//trim(num2lstr(iCase))//':' &

diff --git a/modules/aerodyn/src/UnsteadyAero_Driver.f90 b/modules/aerodyn/src/UnsteadyAero_Driver.f90
@@ -82,13 +82,11 @@ program UnsteadyAero_Driver
 
 
       ! Display the copyright notice
-   CALL DispCopyrightLicense( version )   
+   CALL DispCopyrightLicense( version%Name )
       ! 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 )
-
-
+   CALL WrScr( ' Running '//TRIM( version%Name )//' a part of OpenFAST - '//TRIM(git_Commit)//NewLine//' linked with '//TRIM( NWTC_Ver%Name )//NewLine )
 
 
       ! Parse the driver file if one was provided, if not, then set driver parameters using hardcoded values

diff --git a/modules/aerodyn14/src/DWM.f90 b/modules/aerodyn14/src/DWM.f90
@@ -65,14 +65,11 @@ SUBROUTINE DWM_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, InitOu
    CALL NWTC_Init( )
 
    ! Display the module information
-
-   !CALL DispNVD( DWM__Ver )
-
-   ! read the wind file for DWM
-
    CALL WrScr('')
    CALL DispNVD(DWM_Ver)
 
+   ! read the wind file for DWM
+
    CALL WrScr("  Reading the wind file for DWM simulation." )
 
    ! InitInp%IfW%InputFileName is already set in FAST

diff --git a/modules/beamdyn/src/Driver_Beam.f90 b/modules/beamdyn/src/Driver_Beam.f90
@@ -81,11 +81,11 @@ PROGRAM BeamDyn_Driver_Program
 
    CALL NWTC_Init()
       ! Display the copyright notice
-   CALL DispCopyrightLicense( version )   
+   CALL DispCopyrightLicense( version%Name )
       ! 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 )
+   CALL WrScr( ' Running '//TRIM( version%Name )//' a part of OpenFAST - '//TRIM(git_Commit)//NewLine//' linked with '//TRIM( NWTC_Ver%Name )//NewLine )
 
    ! -------------------------------------------------------------------------
    ! Initialization of glue-code time-step variables

diff --git a/modules/hydrodyn/src/HydroDyn_DriverCode.f90 b/modules/hydrodyn/src/HydroDyn_DriverCode.f90
@@ -157,11 +157,11 @@ PROGRAM HydroDynDriver
    call nwtc_init()
 
          ! Display the copyright notice
-   CALL DispCopyrightLicense( version )   
+   CALL DispCopyrightLicense( version%Name )
       ! 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 )
+   CALL WrScr( ' Running '//TRIM( version%Name )//' a part of OpenFAST - '//TRIM(git_Commit)//NewLine//' linked with '//TRIM( NWTC_Ver%Name )//NewLine )
 
    IF ( command_argument_count() /= 1 ) THEN
       CALL print_help()

diff --git a/modules/hydrodyn/src/WAMIT2.f90 b/modules/hydrodyn/src/WAMIT2.f90
@@ -65,8 +65,6 @@ MODULE WAMIT2
 !   INTEGER(IntKi), PARAMETER                             :: DataFormatID = 1  !< Update this value if the data types change (used in WAMIT_Pack)
    TYPE(ProgDesc), PARAMETER                             :: WAMIT2_ProgDesc = ProgDesc( 'WAMIT2', '', '' )
                                                                               !< This holds the name of the program, version info, and date.
-                                                                              !! It is used by the DispNVD routine in the library and as header
-                                                                              !! information in output files.
 
    REAL(DbKi), PARAMETER, PRIVATE                        :: OnePlusEps  = 1.0 + EPSILON(OnePlusEps)   ! The number slighty greater than unity in the precision of DbKi.
 
@@ -278,7 +276,6 @@ SUBROUTINE WAMIT2_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, Ini
          !> Initialize the NWTC Subroutine Library and display the information about this module.
 
       CALL NWTC_Init() ! WAMIT2_ProgDesc%Name, '('//WAMIT2_ProgDesc%Ver//','//WAMIT2_ProgDesc%Date//')', EchoLibVer = .FALSE. )
-      !CALL DispNVD( WAMIT2_ProgDesc )
 
 
 

diff --git a/modules/hydrodyn/src/Waves2.f90 b/modules/hydrodyn/src/Waves2.f90
@@ -46,8 +46,6 @@ MODULE Waves2
 !   INTEGER(IntKi), PARAMETER                             :: DataFormatID = 1  !< Update this value if the data types change (used in Waves2_Pack)
    TYPE(ProgDesc), PARAMETER                             :: Waves2_ProgDesc = ProgDesc( 'Waves2', '', '' )
                                                                               !< This holds the name of the program, version info, and date.
-                                                                              !! It is used by the DispNVD routine in the library and as header
-                                                                              !! information in output files.
 
    REAL(DbKi), PARAMETER, PRIVATE                        :: OnePlusEps  = 1.0 + EPSILON(OnePlusEps)   ! The number slighty greater than unity in the precision of DbKi.
 
@@ -223,9 +221,6 @@ SUBROUTINE Waves2_Init( InitInp, u, p, x, xd, z, OtherState, y, misc, Interval,
          ! Initialize the NWTC Subroutine Library and display the information about this module.
 
       CALL NWTC_Init( )
-      !CALL DispNVD( Waves2_ProgDesc )
-
-
 
 
       !-----------------------------------------------------------------------------

diff --git a/modules/inflowwind/src/IfW_HAWCWind.f90 b/modules/inflowwind/src/IfW_HAWCWind.f90
@@ -42,6 +42,7 @@ MODULE IfW_HAWCWind
    PUBLIC                                    :: IfW_HAWCWind_CalcOutput
 
    INTEGER(IntKi), PARAMETER  :: nc = 3                           !< number of wind components
+   INTEGER(IntKi), PARAMETER  :: WindProfileType_None     = -1    !< don't add wind profile; already included in input data
    INTEGER(IntKi), PARAMETER  :: WindProfileType_Constant = 0     !< constant wind
    INTEGER(IntKi), PARAMETER  :: WindProfileType_Log      = 1     !< logarithmic
    INTEGER(IntKi), PARAMETER  :: WindProfileType_PL       = 2     !< power law
@@ -95,8 +96,9 @@ SUBROUTINE IfW_HAWCWind_Init(InitInp, p, MiscVars, Interval, InitOut, ErrStat, E
    p%nz           = InitInp%nz   
    p%RefHt        = InitInp%RefHt
    p%URef         = InitInp%URef
-   p%InitPosition = 0.0_ReKi  ! bjj: someday we may want to let the users give an offset time/position
-   p%InitPosition(1) = InitInp%dx
+   p%InitPosition = InitInp%InitPosition
+   if (EqualRealNos(InitInp%InitPosition(1), 0.0_ReKi)) p%InitPosition(1) = InitInp%dx        ! This is the old behaviour
+
 
    p%deltaXInv   = 1.0 / InitInp%dx
    p%deltaYInv   = 1.0 / InitInp%dy
@@ -145,7 +147,7 @@ SUBROUTINE IfW_HAWCWind_Init(InitInp, p, MiscVars, Interval, InitOut, ErrStat, E
       WRITE(InitInp%SumFileUnit,'(A)', IOSTAT=TmpErrStat)    'HAWC wind type.  Read by InflowWind sub-module '//TRIM(GetNVD(IfW_HAWCWind_Ver))      
 
       WRITE(InitInp%SumFileUnit,'(A34,G12.4)',IOSTAT=TmpErrStat)    '     Reference height (m):        ',p%RefHt
-      WRITE(InitInp%SumFileUnit,'(A34,G12.4)',IOSTAT=TmpErrStat)    '     Timestep (s):                ',p%deltaXInv / p%URef
+      WRITE(InitInp%SumFileUnit,'(A34,G12.4)',IOSTAT=TmpErrStat)    '     Timestep (s):                ',1.0_ReKi / (p%deltaXInv * p%URef)
       WRITE(InitInp%SumFileUnit,'(A34,I12)',  IOSTAT=TmpErrStat)    '     Number of timesteps:         ',p%nx
       WRITE(InitInp%SumFileUnit,'(A34,G12.4)',IOSTAT=TmpErrStat)    '     Mean windspeed (m/s):        ',p%URef
       WRITE(InitInp%SumFileUnit,'(A)',        IOSTAT=TmpErrStat)    '     Time range (s):              [ '// &
@@ -213,7 +215,7 @@ SUBROUTINE ValidateInput(InitInp, ErrStat, ErrMsg)
    if (InitInp%WindProfileType == WindProfileType_Log) then
       if ( InitInp%z0 < 0.0_ReKi .or. EqualRealNos( InitInp%z0, 0.0_ReKi ) ) &
          call SetErrStat( ErrID_Fatal, 'The surface roughness length, Z0, must be greater than zero', ErrStat, ErrMsg, RoutineName )
-   elseif ( InitInp%WindProfileType < WindProfileType_Constant .or. InitInp%WindProfileType > WindProfileType_PL)  then                              
+   elseif ( InitInp%WindProfileType < WindProfileType_None .or. InitInp%WindProfileType > WindProfileType_PL)  then                              
        call SetErrStat( ErrID_Fatal, 'The WindProfile type must be 0 (constant), 1 (logarithmic) or 2 (power law).', ErrStat, ErrMsg, RoutineName )
    end if
 

diff --git a/modules/inflowwind/src/IfW_HAWCWind.txt b/modules/inflowwind/src/IfW_HAWCWind.txt
@@ -31,6 +31,7 @@ typedef  ^                       ^                 ReKi              RefHt
 typedef  ^                       ^                 ReKi              URef              -     0     -     "Mean u-component wind speed at the reference height"       meters
 typedef  ^                       ^                 ReKi              PLExp             -     0     -     "Power law exponent (used for PL wind profile type only)"   -
 typedef  ^                       ^                 ReKi              Z0                -     0     -     "Surface roughness length (used for LOG wind profile type only)"  -
+typedef  ^                       ^                 ReKi              InitPosition      3     0     -     "the initial position of grid (distance in FF is offset)"    meters
 
 
 # Init Output