change setting.PreissmannSlot to setting.Solver...

CIMM-ORG · Jul 13, 2023 · 7633f89 · 7633f89
1 parent 9a0a206
commit 7633f89
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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