From 7cdef4fb1685298d226a5857c5dfc2df51a8f7d4 Mon Sep 17 00:00:00 2001 From: andrew-platt Date: Wed, 5 Jun 2024 15:56:20 -0600 Subject: [PATCH 1/3] Simulink: change deprecated `strmatch` to `strcmpi` The `strmatch` command is deprecated in newer MATLAB versions. Using `strcmpi` also allows for case insensitivity (see issue #2232) --- glue-codes/simulink/examples/Test01_SIG.mdl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glue-codes/simulink/examples/Test01_SIG.mdl b/glue-codes/simulink/examples/Test01_SIG.mdl index 4747c02197..1aa20e7edf 100644 --- a/glue-codes/simulink/examples/Test01_SIG.mdl +++ b/glue-codes/simulink/examples/Test01_SIG.mdl @@ -1828,7 +1828,7 @@ Model { ZOrder -3 BlockMirror on NameLocation "top" - Expr "u(strmatch('LSSGagVxa',OutList))" + Expr "u(strcmpi('LSSGagVxa',OutList))" } Block { BlockType SubSystem From 48f58d140bdeafde36f2a426d760d0cb74042380 Mon Sep 17 00:00:00 2001 From: andrew-platt Date: Wed, 5 Jun 2024 15:58:40 -0600 Subject: [PATCH 2/3] Testing: re-enable the `Fake5MW_` aero linearization cases --- reg_tests/CTestList.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reg_tests/CTestList.cmake b/reg_tests/CTestList.cmake index 566f27cd66..af004713bb 100644 --- a/reg_tests/CTestList.cmake +++ b/reg_tests/CTestList.cmake @@ -343,8 +343,8 @@ of_regression_py("EllipticalWing_OLAF_py" "openfast;fastlib;p of_regression_aeroacoustic("IEA_LB_RWT-AeroAcoustics" "openfast;aerodyn15;aeroacoustics") # Linearized OpenFAST regression tests -#of_regression_linear("Fake5MW_AeroLin_B1_UA4_DBEMT3" "-highpass=0.05" "openfast;linear;elastodyn;aerodyn") #segfault currently -- fixed in next PR -#of_regression_linear("Fake5MW_AeroLin_B3_UA6" "-highpass=0.05" "openfast;linear;elastodyn;aerodyn") #segfault currently -- fixed in next PR +of_regression_linear("Fake5MW_AeroLin_B1_UA4_DBEMT3" "-highpass=0.05" "openfast;linear;elastodyn;aerodyn") +of_regression_linear("Fake5MW_AeroLin_B3_UA6" "-highpass=0.05" "openfast;linear;elastodyn;aerodyn") of_regression_linear("WP_Stationary_Linear" "" "openfast;linear;elastodyn") of_regression_linear("Ideal_Beam_Fixed_Free_Linear" "-highpass=0.10" "openfast;linear;beamdyn") of_regression_linear("Ideal_Beam_Free_Free_Linear" "-highpass=0.10" "openfast;linear;beamdyn") From dd2bc2cfa9a3b623128874481bf896c7255679d3 Mon Sep 17 00:00:00 2001 From: andrew-platt Date: Wed, 5 Jun 2024 16:05:02 -0600 Subject: [PATCH 3/3] FF: change vAmb_Exp (etc) valid range to >=0 --- glue-codes/fast-farm/src/FAST_Farm_IO.f90 | 8 ++++---- reg_tests/r-test | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/glue-codes/fast-farm/src/FAST_Farm_IO.f90 b/glue-codes/fast-farm/src/FAST_Farm_IO.f90 index 668b29ac05..8b7937b2a4 100644 --- a/glue-codes/fast-farm/src/FAST_Farm_IO.f90 +++ b/glue-codes/fast-farm/src/FAST_Farm_IO.f90 @@ -1046,13 +1046,13 @@ SUBROUTINE Farm_ValidateInput( p, WD_InitInp, AWAE_InitInp, SC_InitInp, ErrStat, IF (WD_InitInp%C_vAmb_FMin < 0.0_Reki .or. WD_InitInp%C_vAmb_FMin > 1.0_Reki) CALL SetErrStat(ErrID_Fatal,'k_vAmb(2) (FMin) must be between 0 and 1 (inclusive).',ErrStat,ErrMsg,RoutineName) IF (WD_InitInp%C_vAmb_DMin < 0.0_Reki) CALL SetErrStat(ErrID_Fatal,'k_vAmb(3) (DMin) must not be negative.',ErrStat,ErrMsg,RoutineName) IF (WD_InitInp%C_vAmb_DMax <= WD_InitInp%C_vAmb_DMin) CALL SetErrStat(ErrID_Fatal,'k_vAmb(4) (DMax) must be larger than DMin.',ErrStat,ErrMsg,RoutineName) - IF (WD_InitInp%C_vAmb_Exp <= 0.0_Reki) CALL SetErrStat(ErrID_Fatal,'k_vAmb(5) (e) must be positive.',ErrStat,ErrMsg,RoutineName) + IF (WD_InitInp%C_vAmb_Exp < 0.0_Reki) CALL SetErrStat(ErrID_Fatal,'k_vAmb(5) (e) must be >=0.',ErrStat,ErrMsg,RoutineName) IF (WD_InitInp%k_vShr < 0.0_Reki) CALL SetErrStat(ErrID_Fatal,'k_vShr(1) (k_vShr) must not be negative.',ErrStat,ErrMsg,RoutineName) IF (WD_InitInp%C_vShr_FMin < 0.0_Reki .or. WD_InitInp%C_vShr_FMin > 1.0_ReKi) CALL SetErrStat(ErrID_Fatal,'k_vShr(2) (FMin) must be between 0 and 1 (inclusive).',ErrStat,ErrMsg,RoutineName) IF (WD_InitInp%C_vShr_DMin < 0.0_Reki) CALL SetErrStat(ErrID_Fatal,'k_vShr(3) (DMin) must not be negative.',ErrStat,ErrMsg,RoutineName) IF (WD_InitInp%C_vShr_DMax <= WD_InitInp%C_vShr_DMin) CALL SetErrStat(ErrID_Fatal,'k_vShr(4) (DMax) must be larger than DMin.',ErrStat,ErrMsg,RoutineName) - IF (WD_InitInp%C_vShr_Exp <= 0.0_Reki) CALL SetErrStat(ErrID_Fatal,'k_vShr(5) (e) must be positive.',ErrStat,ErrMsg,RoutineName) + IF (WD_InitInp%C_vShr_Exp < 0.0_Reki) CALL SetErrStat(ErrID_Fatal,'k_vShr(5) (e) must be >=0.',ErrStat,ErrMsg,RoutineName) IF (WD_InitInp%Mod_WakeDiam < WakeDiamMod_RotDiam .or. WD_InitInp%Mod_WakeDiam > WakeDiamMod_MtmFlux) THEN call SetErrStat(ErrID_Fatal,'Wake diameter calculation model, Mod_WakeDiam, must be 1 (rotor diameter), 2 (velocity-based), 3 (mass-flux based), 4 (momentum-flux based) or DEFAULT.',ErrStat,ErrMsg,RoutineName) @@ -1085,13 +1085,13 @@ SUBROUTINE Farm_ValidateInput( p, WD_InitInp, AWAE_InitInp, SC_InitInp, ErrStat, if (WD_InitInp%WAT_k_Def_FMin < 0.0_ReKi .or. WD_InitInp%WAT_k_Def_FMin > 1.0_ReKi) call SetErrStat(ErrID_Fatal,'WAT_k_Def(2) (f_min) must be >=0 and <=1.',ErrStat,ErrMsg,RoutineName) if (WD_InitInp%WAT_k_Def_DMin < 0.0_ReKi) call SetErrStat(ErrID_Fatal,'WAT_k_Def(3) (D_min) must be >=0.',ErrStat,ErrMsg,RoutineName) if (WD_InitInp%WAT_k_Def_DMax <= WD_InitInp%WAT_k_Def_DMin) call SetErrStat(ErrID_Fatal,'WAT_k_Def(4) (D_max) must be greater than D_min.',ErrStat,ErrMsg,RoutineName) - if (WD_InitInp%WAT_k_Def_Exp < 0.0_ReKi) call SetErrStat(ErrID_Fatal,'WAT_k_Def(5) (e) must be >0.',ErrStat,ErrMsg,RoutineName) + if (WD_InitInp%WAT_k_Def_Exp < 0.0_ReKi) call SetErrStat(ErrID_Fatal,'WAT_k_Def(5) (e) must be >=0.',ErrStat,ErrMsg,RoutineName) ! Tests on k_Grad if (WD_InitInp%WAT_k_Grad_k_c <= 0.0_ReKi) call SetErrStat(ErrID_Fatal,'WAT_k_Grad(1) (k_def) must be >0.',ErrStat,ErrMsg,RoutineName) if (WD_InitInp%WAT_k_Grad_FMin < 0.0_ReKi .or. WD_InitInp%WAT_k_Grad_FMin > 1.0_ReKi) call SetErrStat(ErrID_Fatal,'WAT_k_Grad(2) (f_min) must be >=0 and <=1.',ErrStat,ErrMsg,RoutineName) if (WD_InitInp%WAT_k_Grad_DMin < 0.0_ReKi) call SetErrStat(ErrID_Fatal,'WAT_k_Grad(3) (D_min) must be >=0.',ErrStat,ErrMsg,RoutineName) if (WD_InitInp%WAT_k_Grad_DMax <= WD_InitInp%WAT_k_Grad_DMin) call SetErrStat(ErrID_Fatal,'WAT_k_Grad(4) (D_max) must be greater than D_min.',ErrStat,ErrMsg,RoutineName) - if (WD_InitInp%WAT_k_Grad_Exp < 0.0_ReKi) call SetErrStat(ErrID_Fatal,'WAT_k_Grad(5) (e) must be >0.',ErrStat,ErrMsg,RoutineName) + if (WD_InitInp%WAT_k_Grad_Exp < 0.0_ReKi) call SetErrStat(ErrID_Fatal,'WAT_k_Grad(5) (e) must be >=0.',ErrStat,ErrMsg,RoutineName) ! summary table call WrScr(' Wake-Added Turbulence (WAT): coefficients:') call WrScr(' k_c f_min D_min D_max e') diff --git a/reg_tests/r-test b/reg_tests/r-test index 9e2b5b5b5c..4d17325af0 160000 --- a/reg_tests/r-test +++ b/reg_tests/r-test @@ -1 +1 @@ -Subproject commit 9e2b5b5b5c5a3421f836c74ccc1c5960825e88dd +Subproject commit 4d17325af0913132fdfe92c15f3ea00669b50d12