Merge branch 'support/lisf-557ww-7.5'

NASA-LIS · Apr 2, 2024 · 5f244df · 5f244df
2 parents 9430b11 + f6cd1e0
commit 5f244df
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/lis/configs/557WW-7.5-FOC/MRF_GHI/lis.config.mr.jules50.rapid.galwem-ge b/lis/configs/557WW-7.5-FOC/MRF_GHI/lis.config.mr.jules50.rapid.galwem-ge
@@ -174,8 +174,8 @@ Model output attributes file:           ./input/tables/MODEL_OUTPUT_LIST.TBL.jul
 # ROUTING MODEL:  RAPID
 Routing model:                               "RAPID router"
 
-RAPID routing model time step:               "1da"
-RAPID river routing time step:               "15mn"   # less than routing model time step
+RAPID routing model time step:               "3hr"   # must match 'Surface model output interval:'
+RAPID river routing time step:               "15mn"   # must match 'LSM model timestep:'
 RAPID routing model output interval:         "3hr"
 RAPID routing model restart interval:        "1mo"
 

diff --git a/lis/configs/557WW-7.5-FOC/MRF_GHI/lis.config.mr.jules50.rapid.galwem.0p25deg b/lis/configs/557WW-7.5-FOC/MRF_GHI/lis.config.mr.jules50.rapid.galwem.0p25deg
@@ -172,8 +172,8 @@ Model output attributes file:           ./input/tables/MODEL_OUTPUT_LIST.TBL.jul
 # ROUTING MODEL:  RAPID
 Routing model:                               "RAPID router"
 
-RAPID routing model time step:               "1da"
-RAPID river routing time step:               "15mn"   # less than routing model time step
+RAPID routing model time step:               "3hr"   # must match 'Surface model output interval:'
+RAPID river routing time step:               "15mn"   # must match 'LSM model timestep:'
 RAPID routing model output interval:         "3hr"
 RAPID routing model restart interval:        "1mo"
 

diff --git a/lis/configs/557WW-7.5-FOC/MRF_GHI/lis.config.mr.noah39.rapid.galwem-ge b/lis/configs/557WW-7.5-FOC/MRF_GHI/lis.config.mr.noah39.rapid.galwem-ge
@@ -205,8 +205,8 @@ Model output attributes file:           ./input/tables/MODEL_OUTPUT_LIST.TBL.noa
 # ROUTING MODEL:  RAPID
 Routing model:                               "RAPID router"
 
-RAPID routing model time step:               "1da"
-RAPID river routing time step:               "15mn"   # less than routing model time step
+RAPID routing model time step:               "3hr"   # must match 'Surface model output interval:'
+RAPID river routing time step:               "15mn"   # must match 'LSM model timestep:'
 RAPID routing model output interval:         "3hr"
 RAPID routing model restart interval:        "1mo"
 

diff --git a/lis/configs/557WW-7.5-FOC/MRF_GHI/lis.config.mr.noah39.rapid.galwem.0p25deg b/lis/configs/557WW-7.5-FOC/MRF_GHI/lis.config.mr.noah39.rapid.galwem.0p25deg
@@ -202,8 +202,8 @@ Model output attributes file:           ./input/tables/MODEL_OUTPUT_LIST.TBL.noa
 # ROUTING MODEL:  RAPID
 Routing model:                               "RAPID router"
 
-RAPID routing model time step:               "1da"
-RAPID river routing time step:               "15mn"   # less than routing model time step
+RAPID routing model time step:               "3hr"   # must match 'Surface model output interval:'
+RAPID river routing time step:               "15mn"   # must match 'LSM model timestep:'
 RAPID routing model output interval:         "3hr"
 RAPID routing model restart interval:        "1mo"
 

diff --git a/lis/configs/557WW-7.5-FOC/MRF_GHI/lis.config.mr.noahmp401.rapid.galwem-ge b/lis/configs/557WW-7.5-FOC/MRF_GHI/lis.config.mr.noahmp401.rapid.galwem-ge
@@ -207,8 +207,8 @@ Model output attributes file:           ./input/tables/MODEL_OUTPUT_LIST.TBL.noa
 # ROUTING MODEL:  RAPID
 Routing model:                               "RAPID router"
 
-RAPID routing model time step:               "1da"
-RAPID river routing time step:               "15mn"   # less than routing model time step
+RAPID routing model time step:               "3hr"   # must match 'Surface model output interval:'
+RAPID river routing time step:               "15mn"   # must match 'LSM model timestep:'
 RAPID routing model output interval:         "3hr"
 RAPID routing model restart interval:        "1mo"
 

diff --git a/lis/configs/557WW-7.5-FOC/MRF_GHI/lis.config.mr.noahmp401.rapid.galwem.0p25deg b/lis/configs/557WW-7.5-FOC/MRF_GHI/lis.config.mr.noahmp401.rapid.galwem.0p25deg
@@ -204,8 +204,8 @@ Model output attributes file:           ./input/tables/MODEL_OUTPUT_LIST.TBL.noa
 # ROUTING MODEL:  RAPID
 Routing model:                               "RAPID router"
 
-RAPID routing model time step:               "1da"
-RAPID river routing time step:               "15mn"   # less than routing model time step
+RAPID routing model time step:               "3hr"   # must match 'Surface model output interval:'
+RAPID river routing time step:               "15mn"   # must match 'LSM model timestep:'
 RAPID routing model output interval:         "3hr"
 RAPID routing model restart interval:        "1mo"
 

diff --git a/lis/configs/557WW-7.5-FOC/NRT_STREAMFLOW/lis.config.nrt_streamflow.jules50.rapid b/lis/configs/557WW-7.5-FOC/NRT_STREAMFLOW/lis.config.nrt_streamflow.jules50.rapid
@@ -390,8 +390,8 @@ Model output attributes file:           ./input/tables/MODEL_OUTPUT_LIST.TBL.jul
 #Sub-models
 Routing model:                               "RAPID router"
 
-RAPID routing model time step:               "12hr"
-RAPID river routing time step:               "15mn"   # less than routing model time step
+RAPID routing model time step:               "3hr"   # must match 'Surface model output interval:'
+RAPID river routing time step:               "15mn"   # must match 'LSM model timestep:'
 RAPID routing model output interval:         "3hr"
 RAPID routing model restart interval:        "12hr"
 

diff --git a/lis/configs/557WW-7.5-FOC/NRT_STREAMFLOW/lis.config.nrt_streamflow.noah39.rapid b/lis/configs/557WW-7.5-FOC/NRT_STREAMFLOW/lis.config.nrt_streamflow.noah39.rapid
@@ -415,8 +415,8 @@ Model output attributes file:           ./input/tables/MODEL_OUTPUT_LIST.TBL.noa
 # ROUTING MODEL:  RAPID
 Routing model:                               "RAPID router"
 
-RAPID routing model time step:               "12hr"
-RAPID river routing time step:               "15mn"   # less than routing model time step
+RAPID routing model time step:               "3hr"   # must match 'Surface model output interval:'
+RAPID river routing time step:               "15mn"   # must match 'LSM model timestep:'
 RAPID routing model output interval:         "3hr"
 RAPID routing model restart interval:        "12hr"
 

diff --git a/lis/configs/557WW-7.5-FOC/NRT_STREAMFLOW/lis.config.nrt_streamflow.noahmp401.rapid b/lis/configs/557WW-7.5-FOC/NRT_STREAMFLOW/lis.config.nrt_streamflow.noahmp401.rapid
@@ -416,8 +416,8 @@ Model output attributes file:           ./input/tables/MODEL_OUTPUT_LIST.TBL.noa
 # ROUTING MODEL:  RAPID
 Routing model:                               "RAPID router"
 
-RAPID routing model time step:               "12hr"
-RAPID river routing time step:               "15mn"   # less than routing model time step
+RAPID routing model time step:               "3hr"   # must match 'Surface model output interval:'
+RAPID river routing time step:               "15mn"   # must match 'LSM model timestep:'
 RAPID routing model output interval:         "3hr"
 RAPID routing model restart interval:        "12hr"