Merge pull request ESCOMP#3 from NCAR/modularize_infiltration_p2

Rename things related to saturated surface runoff Renames the module, derived type, variables and methods related to saturated surface runoff. The rename qflx_sat_surf -> qflx_sat_excess_surf was suggested at a ctsm meeting. The other renames are to be consistent with that and consistent with InfiltrationExcessRunoffMod. Also, remove a long yellowstone test, change PE count for cheyenne: Removing this long test that sometimes exceeds the 2-hour limit I give it (other times it takes just slightly less than 2 hours): ERS_Ly5_P60x1.f10_f10_musgs.IHistClm50BgcCrop.yellowstone_intel.clm-cropMonthOutput. We still have an identical test on cheyenne. Also, increase the PE count on cheyenne to use two full nodes, rather than a partial node.
HPSCTerrSys · Dec 28, 2017 · dff9f5a · dff9f5a
2 parents 647a72b + d7693ce
commit dff9f5a
Show file tree

Hide file tree

Showing 13 changed files with 91 additions and 92 deletions.
diff --git a/src/biogeochem/CNDriverMod.F90 b/src/biogeochem/CNDriverMod.F90
@@ -36,7 +36,7 @@ module CNDriverMod
   use PhotosynthesisMod               , only : photosyns_type
   use ch4Mod                          , only : ch4_type
   use EnergyFluxType                  , only : energyflux_type
-  use SurfRunoffSatMod                , only : surf_runoff_sat_type
+  use SaturatedExcessRunoffMod        , only : saturated_excess_runoff_type
   !
   ! !PUBLIC TYPES:
   implicit none
@@ -91,7 +91,7 @@ subroutine CNDriverNoLeaching(bounds,
        soilbiogeochem_nitrogenflux_inst, soilbiogeochem_nitrogenstate_inst,                &
        atm2lnd_inst, waterstate_inst, waterflux_inst,                                      &
        canopystate_inst, soilstate_inst, temperature_inst, crop_inst, ch4_inst,            &
-       dgvs_inst, photosyns_inst, surf_runoff_sat_inst, energyflux_inst,                   &
+       dgvs_inst, photosyns_inst, saturated_excess_runoff_inst, energyflux_inst,                   &
        nutrient_competition_method, cnfire_method)
     !
     ! !DESCRIPTION:
@@ -175,7 +175,7 @@ subroutine CNDriverNoLeaching(bounds,
     type(ch4_type)                          , intent(in)    :: ch4_inst
     type(dgvs_type)                         , intent(inout) :: dgvs_inst
     type(photosyns_type)                    , intent(in)    :: photosyns_inst
-    type(surf_runoff_sat_type)              , intent(in)    :: surf_runoff_sat_inst
+    type(saturated_excess_runoff_type)      , intent(in)    :: saturated_excess_runoff_inst
     type(energyflux_type)                   , intent(in)    :: energyflux_inst
     class(nutrient_competition_method_type) , intent(inout) :: nutrient_competition_method
     class(cnfire_method_type)               , intent(inout) :: cnfire_method
@@ -737,7 +737,7 @@ subroutine CNDriverNoLeaching(bounds,
 
     call t_startf('CNFire')
     call cnfire_method%CNFireArea(bounds, num_soilc, filter_soilc, num_soilp, filter_soilp, &
-         atm2lnd_inst, energyflux_inst, surf_runoff_sat_inst, waterstate_inst, &
+         atm2lnd_inst, energyflux_inst, saturated_excess_runoff_inst, waterstate_inst, &
          cnveg_state_inst, cnveg_carbonstate_inst, &
          totlitc_col=soilbiogeochem_carbonstate_inst%totlitc_col(begc:endc), &
          decomp_cpools_vr_col=soilbiogeochem_carbonstate_inst%decomp_cpools_vr_col(begc:endc,1:nlevdecomp_full,1:ndecomp_pools), &

diff --git a/src/biogeochem/CNFireBaseMod.F90 b/src/biogeochem/CNFireBaseMod.F90
@@ -35,7 +35,7 @@ module CNFireBaseMod
   use CNVegNitrogenFluxType              , only : cnveg_nitrogenflux_type
   use SoilBiogeochemDecompCascadeConType , only : decomp_cascade_con
   use EnergyFluxType                     , only : energyflux_type
-  use SurfRunoffSatMod                   , only : surf_runoff_sat_type
+  use SaturatedExcessRunoffMod           , only : saturated_excess_runoff_type
   use WaterstateType                     , only : waterstate_type
   use GridcellType                       , only : grc
   use ColumnType                         , only : col
@@ -263,7 +263,7 @@ end subroutine CNFireInterp
 
   !-----------------------------------------------------------------------
   subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_soilp, &
-       atm2lnd_inst, energyflux_inst, surf_runoff_sat_inst, waterstate_inst, &
+       atm2lnd_inst, energyflux_inst, saturated_excess_runoff_inst, waterstate_inst, &
        cnveg_state_inst, cnveg_carbonstate_inst, totlitc_col, decomp_cpools_vr_col, t_soi17cm_col)
     !
     ! !DESCRIPTION:
@@ -280,7 +280,7 @@ subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_
     integer                               , intent(in)    :: filter_soilp(:) ! filter for soil patches
     type(atm2lnd_type)                    , intent(in)    :: atm2lnd_inst
     type(energyflux_type)                 , intent(in)    :: energyflux_inst
-    type(surf_runoff_sat_type)            , intent(in)    :: surf_runoff_sat_inst
+    type(saturated_excess_runoff_type)    , intent(in)    :: saturated_excess_runoff_inst
     type(waterstate_type)                 , intent(in)    :: waterstate_inst
     type(cnveg_state_type)                , intent(inout) :: cnveg_state_inst
     type(cnveg_carbonstate_type)          , intent(inout) :: cnveg_carbonstate_inst

diff --git a/src/biogeochem/CNFireLi2014Mod.F90 b/src/biogeochem/CNFireLi2014Mod.F90
@@ -34,7 +34,7 @@ module CNFireLi2014Mod
   use CNVegNitrogenFluxType              , only : cnveg_nitrogenflux_type
   use SoilBiogeochemDecompCascadeConType , only : decomp_cascade_con
   use EnergyFluxType                     , only : energyflux_type
-  use SurfRunoffSatMod                   , only : surf_runoff_sat_type
+  use SaturatedExcessRunoffMod           , only : saturated_excess_runoff_type
   use WaterstateType                     , only : waterstate_type
   use GridcellType                       , only : grc                
   use ColumnType                         , only : col                
@@ -83,7 +83,7 @@ end function constructor
 
   !-----------------------------------------------------------------------
   subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_soilp, &
-       atm2lnd_inst, energyflux_inst, surf_runoff_sat_inst, waterstate_inst, &
+       atm2lnd_inst, energyflux_inst, saturated_excess_runoff_inst, waterstate_inst, &
        cnveg_state_inst, cnveg_carbonstate_inst, totlitc_col, decomp_cpools_vr_col, t_soi17cm_col)
     !
     ! !DESCRIPTION:
@@ -106,7 +106,7 @@ subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_
     integer                               , intent(in)    :: filter_soilp(:) ! filter for soil patches
     type(atm2lnd_type)                    , intent(in)    :: atm2lnd_inst
     type(energyflux_type)                 , intent(in)    :: energyflux_inst
-    type(surf_runoff_sat_type)            , intent(in)    :: surf_runoff_sat_inst
+    type(saturated_excess_runoff_type)    , intent(in)    :: saturated_excess_runoff_inst
     type(waterstate_type)                 , intent(in)    :: waterstate_inst
     type(cnveg_state_type)                , intent(inout) :: cnveg_state_inst
     type(cnveg_carbonstate_type)          , intent(inout) :: cnveg_carbonstate_inst
@@ -164,7 +164,7 @@ subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_
          fd_pft             => pftcon%fd_pft                                   , & ! Input:
 
          btran2             => energyflux_inst%btran2_patch                    , & ! Input:  [real(r8) (:)     ]  root zone soil wetness                            
-         fsat               => surf_runoff_sat_inst%fsat_col                   , & ! Input:  [real(r8) (:)     ]  fractional area with water table at surface       
+         fsat               => saturated_excess_runoff_inst%fsat_col           , & ! Input:  [real(r8) (:)     ]  fractional area with water table at surface       
          wf                 => waterstate_inst%wf_col                          , & ! Input:  [real(r8) (:)     ]  soil water as frac. of whc for top 0.05 m         
          wf2                => waterstate_inst%wf2_col                         , & ! Input:  [real(r8) (:)     ]  soil water as frac. of whc for top 0.17 m         
 

diff --git a/src/biogeochem/CNFireLi2016Mod.F90 b/src/biogeochem/CNFireLi2016Mod.F90
@@ -34,7 +34,7 @@ module CNFireLi2016Mod
   use CNVegNitrogenFluxType              , only : cnveg_nitrogenflux_type
   use SoilBiogeochemDecompCascadeConType , only : decomp_cascade_con
   use EnergyFluxType                     , only : energyflux_type
-  use SurfRunoffSatMod                   , only : surf_runoff_sat_type
+  use SaturatedExcessRunoffMod           , only : saturated_excess_runoff_type
   use WaterstateType                     , only : waterstate_type
   use GridcellType                       , only : grc                
   use ColumnType                         , only : col                
@@ -84,7 +84,7 @@ end function constructor
 
   !-----------------------------------------------------------------------
   subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_soilp, &
-       atm2lnd_inst, energyflux_inst, surf_runoff_sat_inst, waterstate_inst, &
+       atm2lnd_inst, energyflux_inst, saturated_excess_runoff_inst, waterstate_inst, &
        cnveg_state_inst, cnveg_carbonstate_inst, totlitc_col, decomp_cpools_vr_col, t_soi17cm_col)
     !
     ! !DESCRIPTION:
@@ -108,7 +108,7 @@ subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_
     integer                               , intent(in)    :: filter_soilp(:) ! filter for soil patches
     type(atm2lnd_type)                    , intent(in)    :: atm2lnd_inst
     type(energyflux_type)                 , intent(in)    :: energyflux_inst
-    type(surf_runoff_sat_type)            , intent(in)    :: surf_runoff_sat_inst
+    type(saturated_excess_runoff_type)    , intent(in)    :: saturated_excess_runoff_inst
     type(waterstate_type)                 , intent(in)    :: waterstate_inst
     type(cnveg_state_type)                , intent(inout) :: cnveg_state_inst
     type(cnveg_carbonstate_type)          , intent(inout) :: cnveg_carbonstate_inst
@@ -171,7 +171,7 @@ subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_
          fd_pft             => pftcon%fd_pft                                   , & ! Input:
 
          btran2             => energyflux_inst%btran2_patch                    , & ! Input:  [real(r8) (:)     ]  root zone soil wetness                            
-         fsat               => surf_runoff_sat_inst%fsat_col                   , & ! Input:  [real(r8) (:)     ]  fractional area with water table at surface       
+         fsat               => saturated_excess_runoff_inst%fsat_col           , & ! Input:  [real(r8) (:)     ]  fractional area with water table at surface       
          wf2                => waterstate_inst%wf2_col                         , & ! Input:  [real(r8) (:)     ]  soil water as frac. of whc for top 0.17 m         
 
          is_cwd             => decomp_cascade_con%is_cwd                       , & ! Input:  [logical  (:)     ]  TRUE => pool is a cwd pool                         

diff --git a/src/biogeochem/CNFireMethodMod.F90 b/src/biogeochem/CNFireMethodMod.F90
@@ -96,7 +96,7 @@ end subroutine CNFireInterp_interface
 
   !-----------------------------------------------------------------------
   subroutine CNFireArea_interface (this, bounds, num_soilc, filter_soilc, num_soilp, filter_soilp, &
-       atm2lnd_inst, energyflux_inst, surf_runoff_sat_inst, waterstate_inst, &
+       atm2lnd_inst, energyflux_inst, saturated_excess_runoff_inst, waterstate_inst, &
        cnveg_state_inst, cnveg_carbonstate_inst, totlitc_col, decomp_cpools_vr_col, t_soi17cm_col)
     !
     ! !DESCRIPTION:
@@ -107,7 +107,7 @@ subroutine CNFireArea_interface (this, bounds, num_soilc, filter_soilc, num_soil
     use decompMod                          , only : bounds_type
     use atm2lndType                        , only : atm2lnd_type
     use EnergyFluxType                     , only : energyflux_type
-    use SurfRunoffSatMod                   , only : surf_runoff_sat_type
+    use SaturatedExcessRunoffMod           , only : saturated_excess_runoff_type
     use WaterstateType                     , only : waterstate_type
     use CNVegStateType                     , only : cnveg_state_type
     use CNVegCarbonStateType               , only : cnveg_carbonstate_type
@@ -122,7 +122,7 @@ subroutine CNFireArea_interface (this, bounds, num_soilc, filter_soilc, num_soil
     integer                               , intent(in)    :: filter_soilp(:) !  filter for soil patches
     type(atm2lnd_type)                    , intent(in)    :: atm2lnd_inst
     type(energyflux_type)                 , intent(in)    :: energyflux_inst
-    type(surf_runoff_sat_type)            , intent(in)    :: surf_runoff_sat_inst
+    type(saturated_excess_runoff_type)    , intent(in)    :: saturated_excess_runoff_inst
     type(waterstate_type)                 , intent(in)    :: waterstate_inst
     type(cnveg_state_type)                , intent(inout) :: cnveg_state_inst
     type(cnveg_carbonstate_type)          , intent(inout) :: cnveg_carbonstate_inst

diff --git a/src/biogeochem/CNFireNoFireMod.F90 b/src/biogeochem/CNFireNoFireMod.F90
@@ -16,7 +16,7 @@ module CNFireNoFireMod
   use CNVegNitrogenStateType             , only : cnveg_nitrogenstate_type
   use CNVegNitrogenFluxType              , only : cnveg_nitrogenflux_type
   use EnergyFluxType                     , only : energyflux_type
-  use SurfRunoffSatMod                   , only : surf_runoff_sat_type
+  use SaturatedExcessRunoffMod           , only : saturated_excess_runoff_type
   use WaterstateType                     , only : waterstate_type
   use CNFireMethodMod                    , only : cnfire_method_type
   use CNFireBaseMod                      , only : cnfire_base_type
@@ -58,7 +58,7 @@ end function constructor
 
   !-----------------------------------------------------------------------
   subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_soilp, &
-       atm2lnd_inst, energyflux_inst, surf_runoff_sat_inst, waterstate_inst, &
+       atm2lnd_inst, energyflux_inst, saturated_excess_runoff_inst, waterstate_inst, &
        cnveg_state_inst, cnveg_carbonstate_inst, totlitc_col, decomp_cpools_vr_col, t_soi17cm_col)
     !
     ! !DESCRIPTION:
@@ -76,7 +76,7 @@ subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_
     integer                               , intent(in)    :: filter_soilp(:) ! filter for soil patches
     type(atm2lnd_type)                    , intent(in)    :: atm2lnd_inst
     type(energyflux_type)                 , intent(in)    :: energyflux_inst
-    type(surf_runoff_sat_type)            , intent(in)    :: surf_runoff_sat_inst
+    type(saturated_excess_runoff_type)    , intent(in)    :: saturated_excess_runoff_inst
     type(waterstate_type)                 , intent(in)    :: waterstate_inst
     type(cnveg_state_type)                , intent(inout) :: cnveg_state_inst
     type(cnveg_carbonstate_type)          , intent(inout) :: cnveg_carbonstate_inst

diff --git a/src/biogeochem/CNVegetationFacade.F90 b/src/biogeochem/CNVegetationFacade.F90
@@ -72,7 +72,7 @@ module CNVegetationFacade
   use CNDVType                        , only : dgvs_type
   use CNDVDriverMod                   , only : CNDVDriver, CNDVHIST
   use EnergyFluxType                  , only : energyflux_type
-  use SurfRunoffSatMod                , only : surf_runoff_sat_type
+  use SaturatedExcessRunoffMod        , only : saturated_excess_runoff_type
   use FrictionVelocityMod             , only : frictionvel_type
   use SoilBiogeochemStateType         , only : soilBiogeochem_state_type
   use SoilBiogeochemCarbonStateType   , only : soilbiogeochem_carbonstate_type
@@ -783,7 +783,7 @@ subroutine EcosystemDynamicsPreDrainage(this, bounds, &
        soilbiogeochem_nitrogenflux_inst, soilbiogeochem_nitrogenstate_inst,     &
        atm2lnd_inst, waterstate_inst, waterflux_inst,                           &
        canopystate_inst, soilstate_inst, temperature_inst, crop_inst, ch4_inst, &
-       photosyns_inst, surf_runoff_sat_inst, energyflux_inst,          &
+       photosyns_inst, saturated_excess_runoff_inst, energyflux_inst,          &
        nutrient_competition_method, fireemis_inst)
     !
     ! !DESCRIPTION:
@@ -822,7 +822,7 @@ subroutine EcosystemDynamicsPreDrainage(this, bounds, &
     type(crop_type)                         , intent(inout) :: crop_inst
     type(ch4_type)                          , intent(in)    :: ch4_inst
     type(photosyns_type)                    , intent(in)    :: photosyns_inst
-    type(surf_runoff_sat_type)              , intent(in)    :: surf_runoff_sat_inst
+    type(saturated_excess_runoff_type)      , intent(in)    :: saturated_excess_runoff_inst
     type(energyflux_type)                   , intent(in)    :: energyflux_inst
     class(nutrient_competition_method_type) , intent(inout) :: nutrient_competition_method
     type(fireemis_type)                     , intent(inout) :: fireemis_inst
@@ -852,7 +852,7 @@ subroutine EcosystemDynamicsPreDrainage(this, bounds, &
          soilbiogeochem_nitrogenflux_inst, soilbiogeochem_nitrogenstate_inst,     &
          atm2lnd_inst, waterstate_inst, waterflux_inst,                           &
          canopystate_inst, soilstate_inst, temperature_inst, crop_inst, ch4_inst, &
-         this%dgvs_inst, photosyns_inst, surf_runoff_sat_inst, energyflux_inst,          &
+         this%dgvs_inst, photosyns_inst, saturated_excess_runoff_inst, energyflux_inst,          &
          nutrient_competition_method, this%cnfire_method)
 
     ! fire carbon emissions 

diff --git a/src/biogeophys/HydrologyNoDrainageMod.F90 b/src/biogeophys/HydrologyNoDrainageMod.F90
@@ -16,7 +16,7 @@ Module HydrologyNoDrainageMod
   use TemperatureType   , only : temperature_type
   use SoilHydrologyType , only : soilhydrology_type
   use SoilStateType     , only : soilstate_type
-  use SurfRunoffSatMod  , only : surf_runoff_sat_type
+  use SaturatedExcessRunoffMod, only : saturated_excess_runoff_type
   use InfiltrationExcessRunoffMod, only : infiltration_excess_runoff_type
   use WaterfluxType     , only : waterflux_type
   use WaterstateType    , only : waterstate_type
@@ -44,7 +44,7 @@ subroutine HydrologyNoDrainage(bounds, &
        clm_fates, &
        atm2lnd_inst, soilstate_inst, energyflux_inst, temperature_inst, &
        waterflux_inst, waterstate_inst, &
-       soilhydrology_inst, surf_runoff_sat_inst, infiltration_excess_runoff_inst, &
+       soilhydrology_inst, saturated_excess_runoff_inst, infiltration_excess_runoff_inst, &
        aerosol_inst, canopystate_inst, soil_water_retention_curve)
     !
     ! !DESCRIPTION:
@@ -93,7 +93,7 @@ subroutine HydrologyNoDrainage(bounds, &
     type(waterstate_type)    , intent(inout) :: waterstate_inst
     type(aerosol_type)       , intent(inout) :: aerosol_inst
     type(soilhydrology_type) , intent(inout) :: soilhydrology_inst
-    type(surf_runoff_sat_type), intent(inout) :: surf_runoff_sat_inst
+    type(saturated_excess_runoff_type), intent(inout) :: saturated_excess_runoff_inst
     type(infiltration_excess_runoff_type), intent(inout) :: infiltration_excess_runoff_inst
     type(canopystate_type)   , intent(inout) :: canopystate_inst
     class(soil_water_retention_curve_type), intent(in) :: soil_water_retention_curve
@@ -182,26 +182,26 @@ subroutine HydrologyNoDrainage(bounds, &
       call SetSoilWaterFractions(bounds, num_hydrologyc, filter_hydrologyc, &
            soilhydrology_inst, soilstate_inst, waterstate_inst)
 
-      call surf_runoff_sat_inst%SaturatedSurfaceRunoff(&
+      call saturated_excess_runoff_inst%SaturatedExcessRunoff(&
            bounds, num_hydrologyc, filter_hydrologyc, col, &
            soilhydrology_inst, soilstate_inst, waterflux_inst)
 
       call SetQflxInputs(bounds, num_hydrologyc, filter_hydrologyc, &
-           waterflux_inst, surf_runoff_sat_inst, waterstate_inst)
+           waterflux_inst, saturated_excess_runoff_inst, waterstate_inst)
 
       call infiltration_excess_runoff_inst%InfiltrationExcessRunoff( &
            bounds, num_hydrologyc, filter_hydrologyc, &
-           soilhydrology_inst, soilstate_inst, surf_runoff_sat_inst, waterflux_inst, &
+           soilhydrology_inst, soilstate_inst, saturated_excess_runoff_inst, waterflux_inst, &
            waterstate_inst)
 
       call Infiltration(bounds, num_hydrologyc, filter_hydrologyc, num_urbanc, filter_urbanc,&
            infiltration_excess_runoff_inst, &
-           energyflux_inst, soilhydrology_inst, surf_runoff_sat_inst, &
+           energyflux_inst, soilhydrology_inst, saturated_excess_runoff_inst, &
            waterflux_inst, waterstate_inst)
 
       call TotalSurfaceRunoff(bounds, num_hydrologyc, filter_hydrologyc, &
            num_urbanc, filter_urbanc, &
-           waterflux_inst, soilhydrology_inst, surf_runoff_sat_inst, waterstate_inst)
+           waterflux_inst, soilhydrology_inst, saturated_excess_runoff_inst, waterstate_inst)
 
       call UpdateUrbanPonding(bounds, num_urbanc, filter_urbanc, &
            waterstate_inst, soilhydrology_inst, waterflux_inst)