From 0445b3d1494b3f0a15a2bda3e34f2c6cfca34967 Mon Sep 17 00:00:00 2001 From: andrew-platt Date: Tue, 10 Oct 2023 15:40:51 -0600 Subject: [PATCH] FVW: turn off "Reevaluation" info after first occurance -- [INFO] FVW: Update States: reevaluation at the same starting time --- modules/aerodyn/src/FVW.f90 | 5 ++++- modules/aerodyn/src/FVW_Registry.txt | 1 + modules/aerodyn/src/FVW_Types.f90 | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/aerodyn/src/FVW.f90 b/modules/aerodyn/src/FVW.f90 index 616d96ffc7..d35b1ede7c 100644 --- a/modules/aerodyn/src/FVW.f90 +++ b/modules/aerodyn/src/FVW.f90 @@ -584,7 +584,10 @@ subroutine FVW_UpdateStates( t, n, u, utimes, p, x, xd, z, OtherState, AFInfo, m m%ComputeWakeInduced = .FALSE. endif if (bReevaluation) then - call WrScr('[INFO] FVW: Update States: reevaluation at the same starting time') + if (m%InfoReEval) then + call WrScr('[INFO] FVW: Update States: reevaluation at the same starting time. This will not print on subsequent occurances.') + m%InfoReEval = .false. + endif call RollBackPreviousTimeStep() ! Cancel wake emission done in previous call m%ComputeWakeInduced = .TRUE. endif diff --git a/modules/aerodyn/src/FVW_Registry.txt b/modules/aerodyn/src/FVW_Registry.txt index 698cbf0634..4b7b8028e9 100644 --- a/modules/aerodyn/src/FVW_Registry.txt +++ b/modules/aerodyn/src/FVW_Registry.txt @@ -209,6 +209,7 @@ typedef ^ ^ ReKi typedef ^ ^ ReKi Uind :: - - "Induced velocities obtained at control points" - # Outputs typedef ^ ^ GridOutType GridOutputs {:} - - "Number of VTK grid to output" - +typedef ^ ^ Logical InfoReeval - .true. - "Give info about Reevaluation: gets set to false after first info statement" - # ........ Input ............ # Rotors diff --git a/modules/aerodyn/src/FVW_Types.f90 b/modules/aerodyn/src/FVW_Types.f90 index b1210cdd91..537f0b06b5 100644 --- a/modules/aerodyn/src/FVW_Types.f90 +++ b/modules/aerodyn/src/FVW_Types.f90 @@ -240,6 +240,7 @@ MODULE FVW_Types REAL(ReKi) , DIMENSION(:,:), ALLOCATABLE :: CPs !< Control points used for wake rollup computation [-] REAL(ReKi) , DIMENSION(:,:), ALLOCATABLE :: Uind !< Induced velocities obtained at control points [-] TYPE(GridOutType) , DIMENSION(:), ALLOCATABLE :: GridOutputs !< Number of VTK grid to output [-] + LOGICAL :: InfoReeval = .true. !< Give info about Reevaluation: gets set to false after first info statement [-] END TYPE FVW_MiscVarType ! ======================= ! ========= Rot_InputType ======= @@ -3531,6 +3532,7 @@ subroutine FVW_CopyMisc(SrcMiscData, DstMiscData, CtrlCode, ErrStat, ErrMsg) if (ErrStat >= AbortErrLev) return end do end if + DstMiscData%InfoReeval = SrcMiscData%InfoReeval end subroutine subroutine FVW_DestroyMisc(MiscData, ErrStat, ErrMsg) @@ -3639,6 +3641,7 @@ subroutine FVW_PackMisc(Buf, Indata) call FVW_PackGridOutType(Buf, InData%GridOutputs(i1)) end do end if + call RegPack(Buf, InData%InfoReeval) if (RegCheckErr(Buf, RoutineName)) return end subroutine @@ -3750,6 +3753,8 @@ subroutine FVW_UnPackMisc(Buf, OutData) call FVW_UnpackGridOutType(Buf, OutData%GridOutputs(i1)) ! GridOutputs end do end if + call RegUnpack(Buf, OutData%InfoReeval) + if (RegCheckErr(Buf, RoutineName)) return end subroutine subroutine FVW_CopyRot_InputType(SrcRot_InputTypeData, DstRot_InputTypeData, CtrlCode, ErrStat, ErrMsg)