From d9053527f1c1bac5e198fd754a2d70006f23ba25 Mon Sep 17 00:00:00 2001 From: andrew-platt Date: Thu, 11 Dec 2025 14:34:52 -0700 Subject: [PATCH 1/8] FF WAT: change default WAT_Scalebox to True --- glue-codes/fast-farm/src/FAST_Farm_IO.f90 | 2 +- reg_tests/r-test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glue-codes/fast-farm/src/FAST_Farm_IO.f90 b/glue-codes/fast-farm/src/FAST_Farm_IO.f90 index 53b85ad30b..5792e447b8 100644 --- a/glue-codes/fast-farm/src/FAST_Farm_IO.f90 +++ b/glue-codes/fast-farm/src/FAST_Farm_IO.f90 @@ -837,7 +837,7 @@ SUBROUTINE Farm_ReadPrimaryFile( InputFile, p, WD_InitInp, AWAE_InitInp, OutList CALL ReadVar( UnIn, InputFile, p%WAT_BoxFile, 'WAT_BoxFile', "Filepath to the file containing the u-component of the turbulence box (either predefined or user-defined) (quoted string)", ErrStat2, ErrMsg2, UnEc ); if(failed()) return call ReadAry( UnIn, InputFile, p%WAT_NxNyNz, 3, "WAT_NxNyNz", "Number of points in the x, y, and z directions of the WAT_BoxFile [used only if WAT=2] (m)", ErrStat2, ErrMsg2, UnEc ); if(failed()) return call ReadAry( UnIn, InputFile, p%WAT_DxDyDz, 3, "WAT_DxDyDz", "Distance (in meters) between points in the x, y, and z directions of the WAT_BoxFile [used only if WAT=2] (m)", ErrStat2, ErrMsg2, UnEc ); if(failed()) return - call ReadVarWDefault( UnIn, InputFile, p%WAT_ScaleBox, "WAT_ScaleBox", "Flag to scale the input turbulence box to zero mean and unit standard deviation at every node", .False., ErrStat2, ErrMsg2, UnEc); if(failed()) return + call ReadVarWDefault( UnIn, InputFile, p%WAT_ScaleBox, "WAT_ScaleBox", "Flag to scale the input turbulence box to zero mean and unit standard deviation at every node", .True., ErrStat2, ErrMsg2, UnEc); if(failed()) return call ReadAryWDefault( UnIn, InputFile, TmpRAry5, 5, "WAT_k_Def", & "Calibrated parameters for the influence of the maximum wake deficit on wake-added turbulence (set of 5 parameters: k_Def , DMin, DMax, FMin, Exp) (-) [>=0.0, >=0.0, >DMin, >=0.0 and <=1.0, >=0.0] or DEFAULT [DEFAULT=[0.6, 0.0, 0.0, 2.0, 1.0 ]]", & (/0.6_ReKi, 0.0_ReKi, 0.0_ReKi, 2.0_ReKi, 1.00_ReKi/), ErrStat2, ErrMsg2, UnEc); if(failed()) return diff --git a/reg_tests/r-test b/reg_tests/r-test index 58ae30a293..e532dfd96a 160000 --- a/reg_tests/r-test +++ b/reg_tests/r-test @@ -1 +1 @@ -Subproject commit 58ae30a2936d1ee04e892e5e037dc1b0e0744b58 +Subproject commit e532dfd96afad03293efd633f94dffb618b264f6 From 24556d94056e40891f2a47bc8242a1ed9e2a051d Mon Sep 17 00:00:00 2001 From: andrew-platt Date: Thu, 11 Dec 2025 14:46:25 -0700 Subject: [PATCH 2/8] FF WAT: update docs on WAT_Scalebox --- docs/source/user/fast.farm/InputFiles.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/user/fast.farm/InputFiles.rst b/docs/source/user/fast.farm/InputFiles.rst index 334b9ec0c6..2ae5b87837 100644 --- a/docs/source/user/fast.farm/InputFiles.rst +++ b/docs/source/user/fast.farm/InputFiles.rst @@ -641,7 +641,7 @@ When **WAT=1** the dimensions in each directions are taken as :math:`dx=dy=dz=0. **WAT_ScaleBox**: [flag] When set to True, the input turbulence box is scaled so that it has zero mean and unit standard deviation at every node. -DEFAULT is False. +DEFAULT is True. **WAT_k_Def** [five floats, comma separated] :math:`[k_\text{def}, k_\text{FMin}, k_\text{DMin}, k_\text{DMax}, e]` Tuning parameters for quasi-steady wake deficit effect in the wake-added From 2d3cd877e4b143494895735915842117e75a41f6 Mon Sep 17 00:00:00 2001 From: andrew-platt Date: Wed, 24 Dec 2025 14:48:57 -0700 Subject: [PATCH 3/8] FF: WAT_dXdYdZ from high res grid if same for all turbines if different high res grids on turbines, will set to guidance --- docs/source/user/fast.farm/InputFiles.rst | 5 +++- glue-codes/fast-farm/src/FAST_Farm_Subs.f90 | 31 +++++++++++++++++++-- reg_tests/r-test | 2 +- 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/docs/source/user/fast.farm/InputFiles.rst b/docs/source/user/fast.farm/InputFiles.rst index 2ae5b87837..d51bb97b40 100644 --- a/docs/source/user/fast.farm/InputFiles.rst +++ b/docs/source/user/fast.farm/InputFiles.rst @@ -637,7 +637,10 @@ These are used only if WAT=2. **WAT_DxDyDz**: [three floats, comma separated] Distances (in meters) between points in the x, y, and z directions of the WAT_BoxFile These are used only if WAT=2. -When **WAT=1** the dimensions in each directions are taken as :math:`dx=dy=dz=0.03*\text{RotorDiamRef}`. +When **WAT=1** the dimensions will be set to **[dX_high, dY_high, dZ_high]** if +that is the same for all turbines, otherwise the dimeinaiona will be calculated +using the guidance with :math:`dx=dy=dz=0.03*\text{RotorDiamRef}`. + **WAT_ScaleBox**: [flag] When set to True, the input turbulence box is scaled so that it has zero mean and unit standard deviation at every node. diff --git a/glue-codes/fast-farm/src/FAST_Farm_Subs.f90 b/glue-codes/fast-farm/src/FAST_Farm_Subs.f90 index 555a6169a1..fca66d06f1 100644 --- a/glue-codes/fast-farm/src/FAST_Farm_Subs.f90 +++ b/glue-codes/fast-farm/src/FAST_Farm_Subs.f90 @@ -345,8 +345,7 @@ SUBROUTINE WAT_init( p, WAT_IfW, AWAE_InitInput, ErrStat, ErrMsg ) call MannLibDims(BoxFileRoot, p%RotorDiamRef, p%WAT_NxNyNz, p%WAT_DxDyDz, ErrStat2, ErrMsg2); if (Failed()) return write(sDummy, '(3(I8,1X))') p%WAT_NxNyNz call WrScr(' WAT: NxNyNz set to: '//trim(sDummy)//' (inferred from filename)') - write(sDummy, '(3(F8.3,1X))') p%WAT_DxDyDz - call WrScr(' WAT: DxDyDz set to: '//trim(sDummy)//' (based on rotor diameter)') + call Set_WAT_DxDyDz() ! Use turbine high res deltas if all same endif ! Sanity check if (any(p%WAT_NxNyNz<2)) then @@ -481,7 +480,7 @@ subroutine MannLibDims(BoxFileRoot,RotorDiamRef,Nxyz,Dxyz,ErrStat3,ErrMsg3) ErrStat3 = ErrID_None ErrMsg3 = "" - ! Set Dxyz + ! Calculate Dxyz based on guidance Dxyz=real(RotorDiamRef,ReKi)*ScaleFact ! --- Create a string made of digits and "x" only, starting from the end of the filename @@ -518,6 +517,32 @@ subroutine MannLibDims(BoxFileRoot,RotorDiamRef,Nxyz,Dxyz,ErrStat3,ErrMsg3) ErrStat3=ErrID_None ErrMsg3 ="" end subroutine MannLibDims + subroutine Set_WAT_DxDyDz() + real(ReKi) :: TmpDx,TmpDy,TmpDz + logical :: HResDimsSame + ! Check if all turbines use the same high res deltas + HResDimsSame = .true. + TmpDx = AWAE_InitInp%dX_high(1) + TmpDy = AWAE_InitInp%dY_high(1) + TmpDz = AWAE_InitInp%dZ_high(1) + do i=2,size(AWAE_InitInp%dX_high) + if (.not. EqualRealNos(TmpDx,AWAE_InitInp%dX_high(i))) HResDimsSame = .false. + if (.not. EqualRealNos(TmpDy,AWAE_InitInp%dY_high(i))) HResDimsSame = .false. + if (.not. EqualRealNos(TmpDz,AWAE_InitInp%dZ_high(i))) HResDimsSame = .false. + enddo + ! if all turbines use same high res spacing, use that for WAT spacing + if (HResDimsSame) then + p%WAT_DxDyDz(1) = TmpDx + p%WAT_DxDyDz(2) = TmpDy + p%WAT_DxDyDz(3) = TmpDz + write(sDummy, '(3(F8.3,1X))') p%WAT_DxDyDz + call WrScr(' WAT: DxDyDz set to: '//trim(sDummy)//' (using high res grid resolution)') + ! otherwise fall back to calculated values from MannLibDims + else + write(sDummy, '(3(F8.3,1X))') p%WAT_DxDyDz + call WrScr(' WAT: DxDyDz set to: '//trim(sDummy)//' (high res grids are not identical for all turbines, calculated based on guidance instead)') + endif + end subroutine Set_WAT_DxDyDz end subroutine WAT_init !> Remove mean from all grid nodes and set standard deviation to 1 at all nodes diff --git a/reg_tests/r-test b/reg_tests/r-test index e532dfd96a..03cfba7b88 160000 --- a/reg_tests/r-test +++ b/reg_tests/r-test @@ -1 +1 @@ -Subproject commit e532dfd96afad03293efd633f94dffb618b264f6 +Subproject commit 03cfba7b88880e0d69ef1d9c6355b68b90ac365f From fb7fec70e403fe8b80ca2a4c65246a9d816017ef Mon Sep 17 00:00:00 2001 From: andrew-platt Date: Wed, 24 Dec 2025 14:54:21 -0700 Subject: [PATCH 4/8] FF WAT_DxDyDz: fix typo in 2d3cd877e --- glue-codes/fast-farm/src/FAST_Farm_Subs.f90 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/glue-codes/fast-farm/src/FAST_Farm_Subs.f90 b/glue-codes/fast-farm/src/FAST_Farm_Subs.f90 index fca66d06f1..13e12ae236 100644 --- a/glue-codes/fast-farm/src/FAST_Farm_Subs.f90 +++ b/glue-codes/fast-farm/src/FAST_Farm_Subs.f90 @@ -522,13 +522,13 @@ subroutine Set_WAT_DxDyDz() logical :: HResDimsSame ! Check if all turbines use the same high res deltas HResDimsSame = .true. - TmpDx = AWAE_InitInp%dX_high(1) - TmpDy = AWAE_InitInp%dY_high(1) - TmpDz = AWAE_InitInp%dZ_high(1) - do i=2,size(AWAE_InitInp%dX_high) - if (.not. EqualRealNos(TmpDx,AWAE_InitInp%dX_high(i))) HResDimsSame = .false. - if (.not. EqualRealNos(TmpDy,AWAE_InitInp%dY_high(i))) HResDimsSame = .false. - if (.not. EqualRealNos(TmpDz,AWAE_InitInp%dZ_high(i))) HResDimsSame = .false. + TmpDx = AWAE_InitInput%InputFileData%dX_high(1) + TmpDy = AWAE_InitInput%InputFileData%dY_high(1) + TmpDz = AWAE_InitInput%InputFileData%dZ_high(1) + do i=2,size(AWAE_InitInput%InputFileData%dX_high) + if (.not. EqualRealNos(TmpDx,AWAE_InitInput%InputFileData%dX_high(i))) HResDimsSame = .false. + if (.not. EqualRealNos(TmpDy,AWAE_InitInput%InputFileData%dY_high(i))) HResDimsSame = .false. + if (.not. EqualRealNos(TmpDz,AWAE_InitInput%InputFileData%dZ_high(i))) HResDimsSame = .false. enddo ! if all turbines use same high res spacing, use that for WAT spacing if (HResDimsSame) then From 6656ae95b334c6e4ac586a4335239e9e10a8d978 Mon Sep 17 00:00:00 2001 From: andrew-platt Date: Wed, 24 Dec 2025 15:24:51 -0700 Subject: [PATCH 5/8] FF: add WAT info to summary file, fix segfault --- glue-codes/fast-farm/src/FAST_Farm_IO.f90 | 18 +++++++++++++++++- glue-codes/fast-farm/src/FAST_Farm_Subs.f90 | 6 ++++++ reg_tests/r-test | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/glue-codes/fast-farm/src/FAST_Farm_IO.f90 b/glue-codes/fast-farm/src/FAST_Farm_IO.f90 index 5792e447b8..f03f368bcd 100644 --- a/glue-codes/fast-farm/src/FAST_Farm_IO.f90 +++ b/glue-codes/fast-farm/src/FAST_Farm_IO.f90 @@ -168,7 +168,23 @@ SUBROUTINE Farm_PrintSum( farm, WD_InputFileData, ErrStat, ErrMsg ) end select WRITE (UnSum,'(2X,A)') 'Calibrated parameter for wake meandering (-): '//trim(Num2LStr(farm%AWAE%p%C_Meander)) -!FIXME: add summary info about WAT + if (farm%p%WAT == 0) then + write (UnSum,'(/,2X,A)') 'Wake added turbulence: off' + else + write (UnSum,'(/,2X,A)') 'Wake-Added Turbulence (WAT):' + write (UnSum,'(4X,A,6(f9.3))') 'WAT_NxNyNz: ',farm%p%WAT_NxNyNz(1:3) + write (UnSum,'(4X,A,6(f9.3))') 'WAT_DxDyDz: ',farm%p%WAT_DxDyDz(1:3) + if (farm%p%WAT_ScaleBox) then + write (UnSum,'(4X,A,A)') 'WAT_ScaleBox: ','.TRUE.' + else + write (UnSum,'(4X,A,A)') 'WAT_ScaleBox: ','.FALSE.' + endif + write (UnSum,'(4X,A)') 'coefficients:' + write (UnSum,'(12X,A)') ' k_c f_min D_min D_max e' + write (UnSum,'(A6,A6,6(f9.3))') '','k_Def', farm%WD%p%WAT_k_Def_k_c, farm%WD%p%WAT_k_Def_FMin, farm%WD%p%WAT_k_Def_DMin, farm%WD%p%WAT_k_Def_DMax, farm%WD%p%WAT_k_Def_Exp + write (UnSum,'(A6,A6,6(f9.3))') '','k_Grad',farm%WD%p%WAT_k_Grad_k_c,farm%WD%p%WAT_k_Grad_FMin,farm%WD%p%WAT_k_Grad_DMin,farm%WD%p%WAT_k_Grad_DMax,farm%WD%p%WAT_k_Grad_Exp + endif + WRITE (UnSum,'(/,A)' ) 'Time Steps' WRITE (UnSum,'(2X,A)') 'Component Time Step Subcyles' diff --git a/glue-codes/fast-farm/src/FAST_Farm_Subs.f90 b/glue-codes/fast-farm/src/FAST_Farm_Subs.f90 index 13e12ae236..344241616b 100644 --- a/glue-codes/fast-farm/src/FAST_Farm_Subs.f90 +++ b/glue-codes/fast-farm/src/FAST_Farm_Subs.f90 @@ -520,6 +520,12 @@ end subroutine MannLibDims subroutine Set_WAT_DxDyDz() real(ReKi) :: TmpDx,TmpDy,TmpDz logical :: HResDimsSame + ! If Mod_AmbWind<2, we don't read high res discretizations + if (AWAE_InitInput%InputFileData%Mod_AmbWind < 2) then + write(sDummy, '(3(F8.3,1X))') p%WAT_DxDyDz + call WrScr(' WAT: DxDyDz set to: '//trim(sDummy)//' (calculated based on guidance for Mod_AmbWind==1)') + return + endif ! Check if all turbines use the same high res deltas HResDimsSame = .true. TmpDx = AWAE_InitInput%InputFileData%dX_high(1) diff --git a/reg_tests/r-test b/reg_tests/r-test index 03cfba7b88..1778b2c388 160000 --- a/reg_tests/r-test +++ b/reg_tests/r-test @@ -1 +1 @@ -Subproject commit 03cfba7b88880e0d69ef1d9c6355b68b90ac365f +Subproject commit 1778b2c38800d72098af9e42e7415856509adbe5 From 7cd603a7615c1dcf8eab901e22e1b5be9238e8d8 Mon Sep 17 00:00:00 2001 From: andrew-platt Date: Mon, 29 Dec 2025 18:10:18 -0500 Subject: [PATCH 6/8] FF WAT: fix seg fault in summary file Also fix a few other things: - ElastoDyn Types file had an incorrect comment after some prior PR (no functional change, just regenerated) - summary file writing was accessing farm%WD%p%WAT_k_Def_k_c (etc) for summary file, but WD is an array, so some compilers will segfault. Changed to WD_InputFileData%WAT_k_Def_k_c --- glue-codes/fast-farm/src/FAST_Farm_IO.f90 | 14 +++++++------- modules/elastodyn/src/ElastoDyn_Types.f90 | 2 +- modules/wakedynamics/src/WakeDynamics_Registry.txt | 2 -- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/glue-codes/fast-farm/src/FAST_Farm_IO.f90 b/glue-codes/fast-farm/src/FAST_Farm_IO.f90 index f03f368bcd..00b38e6505 100644 --- a/glue-codes/fast-farm/src/FAST_Farm_IO.f90 +++ b/glue-codes/fast-farm/src/FAST_Farm_IO.f90 @@ -172,17 +172,17 @@ SUBROUTINE Farm_PrintSum( farm, WD_InputFileData, ErrStat, ErrMsg ) write (UnSum,'(/,2X,A)') 'Wake added turbulence: off' else write (UnSum,'(/,2X,A)') 'Wake-Added Turbulence (WAT):' - write (UnSum,'(4X,A,6(f9.3))') 'WAT_NxNyNz: ',farm%p%WAT_NxNyNz(1:3) - write (UnSum,'(4X,A,6(f9.3))') 'WAT_DxDyDz: ',farm%p%WAT_DxDyDz(1:3) + write (UnSum,'(4X,A,3(I8,1X))') 'WAT_NxNyNz: ',farm%p%WAT_NxNyNz(1:3) + write (UnSum,'(4X,A,3(f9.3))') 'WAT_DxDyDz: ',farm%p%WAT_DxDyDz(1:3) if (farm%p%WAT_ScaleBox) then write (UnSum,'(4X,A,A)') 'WAT_ScaleBox: ','.TRUE.' else write (UnSum,'(4X,A,A)') 'WAT_ScaleBox: ','.FALSE.' endif write (UnSum,'(4X,A)') 'coefficients:' - write (UnSum,'(12X,A)') ' k_c f_min D_min D_max e' - write (UnSum,'(A6,A6,6(f9.3))') '','k_Def', farm%WD%p%WAT_k_Def_k_c, farm%WD%p%WAT_k_Def_FMin, farm%WD%p%WAT_k_Def_DMin, farm%WD%p%WAT_k_Def_DMax, farm%WD%p%WAT_k_Def_Exp - write (UnSum,'(A6,A6,6(f9.3))') '','k_Grad',farm%WD%p%WAT_k_Grad_k_c,farm%WD%p%WAT_k_Grad_FMin,farm%WD%p%WAT_k_Grad_DMin,farm%WD%p%WAT_k_Grad_DMax,farm%WD%p%WAT_k_Grad_Exp + write (UnSum,'(16X,A)') 'k_c f_min D_min D_max e' + write (UnSum,'(A12,5(f9.3))') 'k_Def', WD_InputFileData%WAT_k_Def_k_c, WD_InputFileData%WAT_k_Def_FMin, WD_InputFileData%WAT_k_Def_DMin, WD_InputFileData%WAT_k_Def_DMax, WD_InputFileData%WAT_k_Def_Exp + write (UnSum,'(A12,5(f9.3))') 'k_Grad',WD_InputFileData%WAT_k_Grad_k_c,WD_InputFileData%WAT_k_Grad_FMin,WD_InputFileData%WAT_k_Grad_DMin,WD_InputFileData%WAT_k_Grad_DMax,WD_InputFileData%WAT_k_Grad_Exp endif @@ -1102,9 +1102,9 @@ SUBROUTINE Farm_ValidateInput( p, WD_InitInp, AWAE_InitInp, ErrStat, ErrMsg ) ! summary table call WrScr(' Wake-Added Turbulence (WAT): coefficients:') call WrScr(' k_c f_min D_min D_max e') - write(tmpStr,'(A6,A6,6(f9.3))') '','k_Def', WD_InitInp%WAT_k_Def_k_c, WD_InitInp%WAT_k_Def_FMin, WD_InitInp%WAT_k_Def_DMin, WD_InitInp%WAT_k_Def_DMax, WD_InitInp%WAT_k_Def_Exp + write(tmpStr,'(A12,5(f9.3))') 'k_Def', WD_InitInp%WAT_k_Def_k_c, WD_InitInp%WAT_k_Def_FMin, WD_InitInp%WAT_k_Def_DMin, WD_InitInp%WAT_k_Def_DMax, WD_InitInp%WAT_k_Def_Exp call WrScr(tmpStr) - write(tmpStr,'(A6,A6,6(f9.3))') '','k_Grad',WD_InitInp%WAT_k_Grad_k_c,WD_InitInp%WAT_k_Grad_FMin,WD_InitInp%WAT_k_Grad_DMin,WD_InitInp%WAT_k_Grad_DMax,WD_InitInp%WAT_k_Grad_Exp + write(tmpStr,'(A12,5(f9.3))') 'k_Grad',WD_InitInp%WAT_k_Grad_k_c,WD_InitInp%WAT_k_Grad_FMin,WD_InitInp%WAT_k_Grad_DMin,WD_InitInp%WAT_k_Grad_DMax,WD_InitInp%WAT_k_Grad_Exp call WrScr(tmpStr) endif diff --git a/modules/elastodyn/src/ElastoDyn_Types.f90 b/modules/elastodyn/src/ElastoDyn_Types.f90 index 8d4991c773..aaaf95a422 100644 --- a/modules/elastodyn/src/ElastoDyn_Types.f90 +++ b/modules/elastodyn/src/ElastoDyn_Types.f90 @@ -700,7 +700,7 @@ MODULE ElastoDyn_Types REAL(ReKi) , DIMENSION(:), ALLOCATABLE :: FirstMom !< First mass moment of inertia of blades wrt the root [-] REAL(ReKi) :: GenIner = 0.0_ReKi !< Generator inertia about HSS [-] REAL(ReKi) :: Hubf1Iner = 0.0_ReKi !< Inertia of hub about f1-axis (rotor centerline) [-] - REAL(ReKi) :: Hubf2Iner = 0.0_ReKi !< Inertia of hub about f2-axis (transverse to the hub and passing through its c.g.) [-] + REAL(ReKi) :: Hubf2Iner = 0.0_ReKi !< Inertia of hub about f2-axis (teeter axis) [-] REAL(ReKi) :: HubMass = 0.0_ReKi !< Hub mass [-] REAL(ReKi) :: Nacd2Iner = 0.0_ReKi !< Inertia of nacelle about the d2-axis whose origin is the nacelle center of mass [-] REAL(ReKi) :: NacMass = 0.0_ReKi !< Nacelle mass [-] diff --git a/modules/wakedynamics/src/WakeDynamics_Registry.txt b/modules/wakedynamics/src/WakeDynamics_Registry.txt index 0116e82cb1..ef9d3e040c 100644 --- a/modules/wakedynamics/src/WakeDynamics_Registry.txt +++ b/modules/wakedynamics/src/WakeDynamics_Registry.txt @@ -55,7 +55,6 @@ typedef ^ WD_InputFileType ReKi k_vCurl - - typedef ^ WD_InputFileType Logical OutAllPlanes - - - "Output all planes" - # wake added turbulence (WAT) inputs typedef ^ WD_InputFileType Logical WAT - - - "Switch for turning on and off wake-added turbulence" - -#typedef ^ WD_InputFileType ReKi WAT_k_Def {5} - - "Calibrated parameters for the influence of the maximum wake deficit on wake-added turbulence (set of 5 parameters: k_Def , FMin, DMin, DMax, Exp) (-) [>=0.0, >=0.0 and <=1.0, >=0.0, >DMin, >0.0] or DEFAULT [DEFAULT=[0.6, 0.0, 0.0, 2.0, 1.0 ]]" - typedef ^ WD_InputFileType ReKi WAT_k_Def_k_c - - - "Calibrated parameter for the influence of the maximum wake deficit on wake-added turblence (-) [>=0] or DEFAULT [DEFAULT=0.6]" - typedef ^ WD_InputFileType ReKi WAT_k_Def_FMin - - - "Calibrated parameter in the eddy viscosity filter function for the WAT maximum wake deficit defining the value in the minimum region [>=0.0 and <=1.0] or DEFAULT [DEFAULT=0.0]" - typedef ^ WD_InputFileType ReKi WAT_k_Def_DMin - - - "Calibrated parameter in the eddy viscosity filter function for the WAT maximum wake deficit defining the transitional diameter fraction between the minimum and exponential regions [>=0.0] or DEFAULT [DEFAULT=0.0]" - @@ -183,7 +182,6 @@ typedef ^ ParameterType CHARACTER(1024) OutFileVTKDir - - - "The parent di typedef ^ ParameterType IntKi TurbNum - 0 - "Turbine ID number (start with 1; end with number of turbines)" - # wake added turbulence (WAT) parameters typedef ^ ParameterType Logical WAT - - - "Switch for turning on and off wake-added turbulence" - -#typedef ^ ParameterType ReKi WAT_k_Def {5} - - "Calibrated parameters for the influence of the maximum wake deficit on wake-added turbulence (set of 5 parameters: k_Def , FMin, DMin, DMax, Exp) (-) [>=0.0, >=0.0 and <=1.0, >=0.0, >DMin, >0.0] or DEFAULT [DEFAULT=[0.6, 0.0, 0.0, 2.0, 1.0 ]]" - typedef ^ ParameterType ReKi WAT_k_Def_k_c - - - "Calibrated parameter for the influence of the maximum wake deficit on wake-added turblence (-) [>=0] or DEFAULT [DEFAULT=0.6]" - typedef ^ ParameterType ReKi WAT_k_Def_FMin - - - "Calibrated parameter in the eddy viscosity filter function for the WAT maximum wake deficit defining the value in the minimum region [>=0.0 and <=1.0] or DEFAULT [DEFAULT=0.0]" - typedef ^ ParameterType ReKi WAT_k_Def_DMin - - - "Calibrated parameter in the eddy viscosity filter function for the WAT maximum wake deficit defining the transitional diameter fraction between the minimum and exponential regions [>=0.0] or DEFAULT [DEFAULT=0.0]" - From e73141143e08496607c472357c5ed0f7fa8c8137 Mon Sep 17 00:00:00 2001 From: andrew-platt Date: Tue, 30 Dec 2025 07:36:03 -0500 Subject: [PATCH 7/8] FF WAT: update first set of reg test results --- reg_tests/r-test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reg_tests/r-test b/reg_tests/r-test index 1778b2c388..b806417f9d 160000 --- a/reg_tests/r-test +++ b/reg_tests/r-test @@ -1 +1 @@ -Subproject commit 1778b2c38800d72098af9e42e7415856509adbe5 +Subproject commit b806417f9d23a9f088259a0eb0bdc89f09e97ba0 From afec8626fb15c48609b07ac7f6943419481b756d Mon Sep 17 00:00:00 2001 From: andrew-platt Date: Tue, 30 Dec 2025 20:09:18 -0500 Subject: [PATCH 8/8] FF WAT: update second set of reg test results --- reg_tests/r-test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reg_tests/r-test b/reg_tests/r-test index b806417f9d..ecdfa25bfe 160000 --- a/reg_tests/r-test +++ b/reg_tests/r-test @@ -1 +1 @@ -Subproject commit b806417f9d23a9f088259a0eb0bdc89f09e97ba0 +Subproject commit ecdfa25bfe21ccbe3987133f3fdbc35458aaae1a