Merge branch 'development' of https://github.com/CIMM-ORG/SWMM5plus i…

…nto development
CIMM-ORG · Jul 28, 2023 · d1b8ef1 · d1b8ef1
2 parents 52d5d38 + 8578dee
commit d1b8ef1
Show file tree

Hide file tree

Showing 4 changed files with 264 additions and 78 deletions.
diff --git a/definitions/define_settings.f90 b/definitions/define_settings.f90
@@ -190,7 +190,7 @@ module define_settings
         real(8) :: TargetCelerity = 15.0d0
         real(8) :: Alpha = 3.0d0
         real(8) :: DecayRate = 5.0
-        real(8) :: MinimumInitialPreissmannNumber = 3.0d0
+        real(8) :: PNminumum = 3.0d0
     end type PreissmannSlotType
 
     !% setting%Output%Report
@@ -1921,9 +1921,9 @@ subroutine define_settings_load()
         if ((.not. found) .and. (jsoncheck)) stop "Error - json file - setting " // 'Solver.PreissmannSlot.DecayRate not found'
 
       !%                      Minimum initial preissmann number
-        call json%get('Solver.PreissmannSlot.MinimumInitialPreissmannNumber', real_value, found)
-        if (found) setting%Solver%PreissmannSlot%MinimumInitialPreissmannNumber = real_value
-        if ((.not. found) .and. (jsoncheck)) stop "Error - json file - setting " // 'Solver.PreissmannSlot.MinimumInitialPreissmannNumber not found'
+        call json%get('Solver.PreissmannSlot.PNminumum', real_value, found)
+        if (found) setting%Solver%PreissmannSlot%PNminumum = real_value
+        if ((.not. found) .and. (jsoncheck)) stop "Error - json file - setting " // 'Solver.PreissmannSlot.PNminumum not found'
 
 
     !% TestCase.  =====================================================================