From 30213a3a9a5eb8b3b6805d66464f8fcf2b468db6 Mon Sep 17 00:00:00 2001 From: Hannah Ross Date: Tue, 13 Aug 2024 13:10:10 -0600 Subject: [PATCH 1/2] Correct frequency error in AeroDyn driver prescribed motions --- modules/aerodyn/src/AeroDyn_Driver_Subs.f90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/aerodyn/src/AeroDyn_Driver_Subs.f90 b/modules/aerodyn/src/AeroDyn_Driver_Subs.f90 index 010ac7290..68e35e361 100644 --- a/modules/aerodyn/src/AeroDyn_Driver_Subs.f90 +++ b/modules/aerodyn/src/AeroDyn_Driver_Subs.f90 @@ -1105,7 +1105,7 @@ subroutine Dvr_ReadInputFile(fileName, dvr, errStat, errMsg ) call ParseVar(FileInfo_In, CurLine, 'amplitude'//sWT , wt%amplitude, errStat2, errMsg2, unEc); if(Failed()) return call ParseVar(FileInfo_In, CurLine, 'frequency'//sWT , wt%frequency, errStat2, errMsg2, unEc); if(Failed()) return call ParseVar(FileInfo_In, CurLine, 'baseMotionFilename'//sWT, wt%motionFileName, errStat2, errMsg2, unEc); if(Failed()) return - wt%frequency = wt%frequency * 2 *pi ! Hz to rad/s + wt%frequency = wt%frequency * 2 * pi ! Hz to rad/s if (dvr%analysisType==idAnalysisRegular) then if (wt%motionType==idBaseMotionGeneral) then call ReadDelimFile(wt%motionFileName, 19, wt%motion, errStat2, errMsg2, priPath=priPath); if(Failed()) return @@ -1313,7 +1313,7 @@ subroutine setSimpleMotion(wt, rotSpeed, bldPitch, nacYaw, DOF, amplitude, frequ integer :: i wt%degreeofFreedom = DOF wt%amplitude = amplitude - wt%frequency = frequency * 2 *pi ! Hz to rad/s + wt%frequency = frequency wt%nac%motionType = idNacMotionConstant wt%nac%yaw = nacYaw* PI /180._ReKi ! deg 2 rad wt%hub%motionType = idHubMotionConstant From 2e9df2e4a7326e17f6bc17b3c7ef99b88a2fd70e Mon Sep 17 00:00:00 2001 From: andrew-platt Date: Tue, 13 Aug 2024 14:36:25 -0600 Subject: [PATCH 2/2] update regression test ad_BAR_CombinedCases --- 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 e255d365b..66351431a 160000 --- a/reg_tests/r-test +++ b/reg_tests/r-test @@ -1 +1 @@ -Subproject commit e255d365baf60775f89a3b67cbd151b179f1e87e +Subproject commit 66351431a6b29ec096665861aa0801ccedf01c26