IfW_uniform: remove file passing option

andrew-platt · Dec 23, 2024 · bb000fe · bb000fe
1 parent eab6ed1
commit bb000fe
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 12 deletions.
diff --git a/modules/inflowwind/src/InflowWind.f90 b/modules/inflowwind/src/InflowWind.f90
@@ -255,8 +255,6 @@ SUBROUTINE InflowWind_Init( InitInp, InputGuess, p, ContStates, DiscStates, Cons
       Uniform_InitInput%RefHt          = InputFileData%Uniform_RefHt
       Uniform_InitInput%RefLength      = InputFileData%Uniform_RefLength
       Uniform_InitInput%PropagationDir = InputFileData%PropagationDir
-      Uniform_InitInput%UseInputFile   =  InitInp%WindType2UseInputFile
-      Uniform_InitInput%PassedFileInfo =  InitInp%WindType2Info
 
       p%FlowField%FieldType = Uniform_FieldType
       call IfW_UniformWind_Init(Uniform_InitInput, SumFileUnit, p%FlowField%Uniform, InitOutData%WindFileInfo, TmpErrStat, TmpErrMsg); if (Failed()) return

diff --git a/modules/inflowwind/src/InflowWind.txt b/modules/inflowwind/src/InflowWind.txt
@@ -91,8 +91,6 @@ typedef  ^                       ^                 CHARACTER(1024)   RootName
 typedef  ^                       ^                 IntKi             FilePassingMethod -     0     -     "Method for file passing {0: None (read from file), 1: as FileInfoType to parse, 2: as InputFileType already parsed}" -
 typedef  ^                       ^                 FileInfoType      PassedFileInfo    -     -     -     "If we don't use the input file, pass everything through this [FilePassingMethod = 1]" -
 typedef  ^                       ^                 InflowWind_InputFile PassedFileData -     -     -     "If we don't use the input file, pass everything through this [FilePassingMethod = 2]" -
-typedef  ^                       ^                 LOGICAL           WindType2UseInputFile   -     .TRUE.     -      "Flag for toggling file based IO in wind type 2."                -
-typedef  ^                       ^                 FileInfoType      WindType2Info     -     -     -      "Optional slot for wind type 2 data if file IO is not used."                -
 typedef  ^                       ^                 LOGICAL           OutputAccel       -     .FALSE.     -      "Flag to output wind acceleration"                                    -
 typedef  ^                       ^              Lidar_InitInputType  lidar             -     -     -     "InitInput for lidar data"                                             -
 typedef  ^                       ^              Grid4D_InitInputType FDext             -     -     -     "InitInput for 4D external wind data"                                             -

diff --git a/modules/inflowwind/src/InflowWind_IO.f90 b/modules/inflowwind/src/InflowWind_IO.f90
@@ -182,12 +182,8 @@ subroutine IfW_UniformWind_Init(InitInp, SumFileUnit, UF, FileDat, ErrStat, ErrM
    UF%RefHeight = InitInp%RefHt
    UF%RefLength = InitInp%RefLength
 
-   ! Read wind data from file or init input data
-   if (InitInp%UseInputFile) then
-      call ProcessComFile(InitInp%WindFileName, WindFileInfo, TmpErrStat, TmpErrMsg)
-   else
-      call NWTC_Library_CopyFileInfoType(InitInp%PassedFileInfo, WindFileInfo, MESH_NEWCOPY, TmpErrStat, TmpErrMsg)
-   end if
+   ! Read wind data from file
+   call ProcessComFile(InitInp%WindFileName, WindFileInfo, TmpErrStat, TmpErrMsg)
    call SetErrStat(TmpErrStat, TmpErrMsg, ErrStat, ErrMsg, RoutineName)
    if (ErrStat >= AbortErrLev) return
 

diff --git a/modules/inflowwind/src/InflowWind_IO.txt b/modules/inflowwind/src/InflowWind_IO.txt
@@ -40,7 +40,6 @@ typedef  ^              ^                     ReKi                    RefHt
 typedef  ^              ^                     ReKi                    RefLength               -     -     -     "Reference length for linear horizontal and vertical sheer"     -
 typedef  ^              ^                     ReKi                    PropagationDir          -     -     -     "Direction of wind propagation"                                 radians
 typedef  ^              ^                     logical                 UseInputFile            -   .true.  -     "Flag for toggling file based IO in wind type 2."               -
-typedef  ^              ^                     FileInfoType            PassedFileInfo          -     -     -     "Optional slot for wind type 2 data if file IO is not used."    -
 
 #----------------------------------------------------------------------------------------------------------------------------------
 typedef  ^              Grid3D_InitInputType  IntKi                   ScaleMethod             -     0     -     "Turbulence scaling method [0=none, 1=direct scaling, 2= calculate scaling factor based on a desired standard deviation]"  -

diff --git a/modules/inflowwind/src/InflowWind_Subs.f90 b/modules/inflowwind/src/InflowWind_Subs.f90
@@ -699,7 +699,7 @@ SUBROUTINE InflowWind_ValidateInput( InitInp, InputFileData, ErrStat, ErrMsg )
          CALL Steady_ValidateInput()
 
       CASE ( Uniform_WindNumber )
-         IF ( InitInp%WindType2UseInputFile ) CALL Uniform_ValidateInput()
+         CALL Uniform_ValidateInput()
 
       CASE ( TSFF_WindNumber )
          CALL TSFF_ValidateInput()