From 7633f89f641304a22679c67b75684d96a635c83b Mon Sep 17 00:00:00 2001 From: Ben Hodges Date: Thu, 13 Jul 2023 08:26:45 -0500 Subject: [PATCH] change setting.PreissmannSlot to setting.Solver... --- definitions/define_settings.f90 | 4 ++-- initialization/initial_condition.f90 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/definitions/define_settings.f90 b/definitions/define_settings.f90 index 0676d08f..d0e6a264 100644 --- a/definitions/define_settings.f90 +++ b/definitions/define_settings.f90 @@ -182,7 +182,7 @@ module define_settings !% large topwidths that will cause large plan areas at their junctions. end type - !% setting%PreissmannSlot + !% setting%Solver%PreissmannSlot type PreissmannSlotType logical :: useSlotTF = .true. !% Allowable values: DynamicSlot, StaticSlot @@ -759,7 +759,7 @@ module define_settings type(OrificeType) :: Orifice type(OutputType) :: Output type(PartitioningType) :: Partitioning - type(PreissmannSlotType) :: PreissmannSlot + !type(PreissmannSlotType) :: PreissmannSlot type(ProfileType) :: Profile type(PumpSettingType) :: Pump type(SimulationType) :: Simulation diff --git a/initialization/initial_condition.f90 b/initialization/initial_condition.f90 index 01e334cf..e66046d6 100644 --- a/initialization/initial_condition.f90 +++ b/initialization/initial_condition.f90 @@ -4962,8 +4962,8 @@ subroutine init_IC_slot () elemR(1:thisSize,er_Preissmann_Number_initial) = TargetPCelerity / (Alpha * sqrt(grav & * elemR(1:size(elemR,1)-1,er_FullDepth))) - where (elemR(1:thisSize,er_Preissmann_Number_initial) < setting%PreissmannSlot%MinimumInitialPreissmannNumber) - elemR(1:thisSize,er_Preissmann_Number_initial) = setting%PreissmannSlot%MinimumInitialPreissmannNumber + where (elemR(1:thisSize,er_Preissmann_Number_initial) < setting%Solver%PreissmannSlot%MinimumInitialPreissmannNumber) + elemR(1:thisSize,er_Preissmann_Number_initial) = setting%Solver%PreissmannSlot%MinimumInitialPreissmannNumber endwhere !% --- only calculate slots for ETM time-march