From eb0329c20422f99325e4f041cd73b2a122f77907 Mon Sep 17 00:00:00 2001 From: Emmanuel Branlard Date: Mon, 6 May 2024 15:41:48 -0400 Subject: [PATCH] AD: default value for skew redistr mod --- docs/source/user/aerodyn/examples/ad_primary_example.dat | 2 +- docs/source/user/aerodyn/input.rst | 2 +- modules/aerodyn/src/AeroDyn_IO.f90 | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/user/aerodyn/examples/ad_primary_example.dat b/docs/source/user/aerodyn/examples/ad_primary_example.dat index 3b1127ca8..8f74766f1 100644 --- a/docs/source/user/aerodyn/examples/ad_primary_example.dat +++ b/docs/source/user/aerodyn/examples/ad_primary_example.dat @@ -22,7 +22,7 @@ False CompAA - Flag to compute AeroAcoustics calculation [us --- Skew correction 1 Skew_Mod - Skew model {0=No skew model, -1=Remove non-normal component for linearization, 1=skew model active} True SkewMomCorr - Turn the skew momentum correction on or off [used only when Skew_Mod=1] - 1 SkewRedistr_Mod - Type of skewed-wake correction model (switch) {0=no redistribution, 1=Glauert/Pitt/Peters} [used only when Skew_Mod=1] + 1 SkewRedistr_Mod - Type of skewed-wake correction model (switch) {0=no redistribution, 1=Glauert/Pitt/Peters, default=1} [used only when Skew_Mod=1] "default" SkewRedistrFactor - Constant used in Pitt/Peters skewed wake model {or "default" is 15/32*pi} (-) [used only when Skew_Mod=1 and SkewRedistr_Mod=1] --- BEM algorithm True TipLoss - Use the Prandtl tip-loss model? (flag) [unused when WakeMod=0 or 3] diff --git a/docs/source/user/aerodyn/input.rst b/docs/source/user/aerodyn/input.rst index 66e6b59c6..236694488 100644 --- a/docs/source/user/aerodyn/input.rst +++ b/docs/source/user/aerodyn/input.rst @@ -211,7 +211,7 @@ The feature will be documented at a later time. Link to old inputs: the previous behavior would be `SkewMomCorr=False` **SkewRedistr_Mod** -``SkewRedistr_Mod`` allows to turn on and off the induced velocity redistribution model, and give room for other models to be selected/implemented. +``SkewRedistr_Mod`` allows to turn on and off the induced velocity redistribution model, and give room for other models to be selected/implemented. Default=1. - 0: no redistribution - 1: Glauert (Pitt-Peters) redistribution model diff --git a/modules/aerodyn/src/AeroDyn_IO.f90 b/modules/aerodyn/src/AeroDyn_IO.f90 index 4744dee84..176077312 100644 --- a/modules/aerodyn/src/AeroDyn_IO.f90 +++ b/modules/aerodyn/src/AeroDyn_IO.f90 @@ -806,7 +806,7 @@ SUBROUTINE ParsePrimaryFileInfo( PriPath, InitInp, InputFile, RootName, NumBlade endif ! SkewRedistr_Mod - Type of skewed-wake correction model (switch) {0: no redistribution, 1=Glauert/Pitt/Peters, 2=Vortex Cylinder} [unsed only when SkewMod=1] - call ParseVar( FileInfo_In, CurLine, "SkewRedistr_Mod", InputFileData%SkewRedistr_Mod, ErrStat2, ErrMsg2, UnEc ) + call ParseVarWDefault( FileInfo_In, CurLine, "SkewRedistr_Mod", InputFileData%SkewRedistr_Mod, 1, ErrStat2, ErrMsg2, UnEc ) if (newInputMissing('SkewRedistr_Mod', CurLine, errStat2, errMsg2)) then call WrScr(' Setting SkewRedistr_Mod to 1 as the input is Missing (legacy behavior).') InputFileData%SkewRedistr_Mod = 1 @@ -815,7 +815,7 @@ SUBROUTINE ParsePrimaryFileInfo( PriPath, InitInp, InputFile, RootName, NumBlade ! SkewModFactor - Constant used in Pitt/Peters skewed wake model {or "default" is 15/32*pi} (-) [used only when SkewMod=2; unused when WakeMod=0 or 3] call ParseVarWDefault( FileInfo_In, CurLine, "SkewModFactor", InputFileData%SkewModFactor, (15.0_ReKi * pi / 32.0_ReKi), ErrStat2, ErrMsg2, UnEc ) if( legacyInputPresent('SkewModFactor', CurLine, ErrStat2, ErrMsg2, 'Rename this parameter to SkewRedistrFactor')) then - + ! pass else call ParseVarWDefault( FileInfo_In, CurLine, "SkewRedistrFactor", InputFileData%SkewModFactor, (15.0_ReKi * pi / 32.0_ReKi), ErrStat2, ErrMsg2, UnEc ); if (Failed()) return call ParseCom (FileInfo_in, CurLine, sDummy, errStat2, errMsg2, UnEc, isLegalComment); if (Failed()) return