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

NASA-LIS · Jul 5, 2024 · 3724bed · 3724bed
2 parents dbdb283 + 8a1c77a
commit 3724bed
Show file tree

Hide file tree

Showing 28 changed files with 2,635 additions and 379 deletions.
diff --git a/docs/LIS_users_guide/revision_table.adoc b/docs/LIS_users_guide/revision_table.adoc
@@ -2,6 +2,7 @@
 |====
 |Revision | Summary of Changes                         | Date
 
+|2.6      | LISF 557WW 7.5.15 release                  | Jun 14, 2024
 |3.0      | LISF Public 7.5.0 release                  | Jan 11, 2024
 |2.5      | LISF 557WW 7.5.9 release                   | Jul 05, 2023
 |2.4      | LISF 557WW 7.5.8 release                   | Jun 30, 2023

diff --git a/lis/configs/557WW-7.5-FOC/NRT_GLOBAL/lis.config.global.noah39.galwem17 b/lis/configs/557WW-7.5-FOC/NRT_GLOBAL/lis.config.global.noah39.galwem17
@@ -25,16 +25,16 @@ Output data format:                     netcdf
 Output naming style:                    "WMO convention"
 Enable output statistics:               .false.
 Start mode:                             restart
-Starting year:                          2022
-Starting month:                           08
-Starting day:                             01
-Starting hour:                             0
+Starting year:                          2024
+Starting month:                           06
+Starting day:                             11
+Starting hour:                            12
 Starting minute:                           0
 Starting second:                           0
-Ending year:                            2022
-Ending month:                             08
-Ending day:                               01
-Ending hour:                              12
+Ending year:                            2024
+Ending month:                             06
+Ending day:                               12
+Ending hour:                              00
 Ending minute:                             5
 Ending second:                             0
 Undefined value:                       -9999
@@ -95,8 +95,10 @@ Bias estimation restart file:                         none
 
 #Perturbation options
 Perturbations start mode:                             restart                                 restart                                 restart
+#Perturbations start mode:                     coldstart coldstart coldstart
+
 Perturbations restart output interval:                12hr                                    12hr                                    12hr
-Perturbations restart filename:   ./input/restarts/LIS_DAPERT_202208010000.d01.bin   ./input/restarts/LIS_DAPERT_202208010000.d01.bin   ./input/restarts/LIS_DAPERT_202208010000.d01.bin
+Perturbations restart filename:   ./input/rstfiles/LIS_DAPERT_202406111200.d01.bin   ./input/rstfiles/LIS_DAPERT_202406111200.d01.bin   ./input/rstfiles/LIS_DAPERT_202406111200.d01.bin
 Apply perturbation bias correction:                   1                                       1                                       1
 
 Forcing perturbation algorithm:                       "GMAO scheme"                           "GMAO scheme"                           "GMAO scheme"
@@ -235,9 +237,9 @@ AGRMET CMORPH minimum temperature threshold:      273
 # Use IMERG rainfall data
 AGRMET use IMERG data:                     1               # 1 = Use
 AGRMET IMERG temperature threshold:        278
-AGRMET IMERG data directory:               ./input/USAF_FORCING/IMERG/Early_V06B
+AGRMET IMERG data directory:               ./input/USAF_FORCING/IMERG
 AGRMET IMERG product:                      3B-HHR-E        # Early Run
-AGRMET IMERG version:                      V06E            # V06E released 8 Nov 2023
+AGRMET IMERG version:                      V07B            # V07B released 1 Jun 2024
 AGRMET IMERG Probability Liquid Precip Threshold: 100
 
 # Bratseth runtime settings
@@ -326,6 +328,8 @@ AGRMET cloud data directory:               WWMCA_GRIB      # WWMCA_LE, NONE, or
 # Use WWMCA GRIB1 files beginning 12Z 4 Jul 2020
 AGRMET WWMCA GRIB1 read option:            1
 AGRMET snow distribution shape parameter:  2.6
+AGRMET radiation derived from: GALWEM_RAD # WWMCA turned off Jul 2024
+AGRMET GALWEM radiation data directory: GALWEM
 
 # Legacy AGRMET settings.  Eventually these will be removed,
 # but for now keep these settings.
@@ -361,7 +365,7 @@ AGRMET overcast percentage:                          0.30
 #-----------------------LAND SURFACE MODELS--------------------------
 Noah.3.9 model timestep:                  15mn
 Noah.3.9 restart output interval:         12hr
-Noah.3.9 restart file:                    ./input/restarts/LIS_RST_NOAH39_202208010000.d01.nc
+Noah.3.9 restart file:                    ./input/rstfiles/LIS_RST_NOAH39_202406111200.d01.nc
 Noah.3.9 restart file format:             netcdf
 Noah.3.9 vegetation parameter table:      ./input/LS_PARAMETERS/noah39_parms/VEGPARM.TBL
 Noah.3.9 soil parameter table:            ./input/LS_PARAMETERS/noah39_parms/SOILPARM.TBL

diff --git a/lis/configs/557WW-7.5-FOC/NRT_GLOBAL/lis.config.global.noahmp401.galwem17 b/lis/configs/557WW-7.5-FOC/NRT_GLOBAL/lis.config.global.noahmp401.galwem17
@@ -25,16 +25,16 @@ Output data format:                     netcdf
 Output naming style:                    "WMO convention"
 Enable output statistics:               .false.
 Start mode:                             restart
-Starting year:                          2022
-Starting month:                            8
-Starting day:                              1
-Starting hour:                             0
+Starting year:                          2024
+Starting month:                           06
+Starting day:                             11
+Starting hour:                            12
 Starting minute:                           0
 Starting second:                           0
-Ending year:                            2022
-Ending month:                              8
-Ending day:                                1
-Ending hour:                              12
+Ending year:                            2024
+Ending month:                             06
+Ending day:                               12
+Ending hour:                              00
 Ending minute:                             5
 Ending second:                             0
 Undefined value:                       -9999
@@ -95,9 +95,10 @@ Bias estimation restart file:                         none
 
 #Perturbation options
 Perturbations start mode:                             restart                                 restart                                 restart
+#Perturbations start mode: coldstart coldstart coldstart
 
 Perturbations restart output interval:                12hr                                    12hr                                    12hr
-Perturbations restart filename:   ./input/restarts/LIS_DAPERT_202208010000.d01.bin   ./input/restarts/LIS_DAPERT_202208010000.d01.bin   ./input/restarts/LIS_DAPERT_202208010000.d01.bin
+Perturbations restart filename:   ./input/rstfiles/LIS_DAPERT_202406111200.d01.bin   ./input/rstfiles/LIS_DAPERT_202406111200.d01.bin   ./input/rstfiles/LIS_DAPERT_202406111200.d01.bin
 Apply perturbation bias correction:                   1                                       1                                       1
 
 Forcing perturbation algorithm:                       "GMAO scheme"                           "GMAO scheme"                           "GMAO scheme"
@@ -236,9 +237,9 @@ AGRMET CMORPH minimum temperature threshold:      273
 # Use IMERG rainfall data
 AGRMET use IMERG data:                     1               # 1 = Use
 AGRMET IMERG temperature threshold:        278
-AGRMET IMERG data directory:               ./input/USAF_FORCING/IMERG/Early_V06B
+AGRMET IMERG data directory:               ./input/USAF_FORCING/IMERG
 AGRMET IMERG product:                      3B-HHR-E        # Early Run
-AGRMET IMERG version:                      V06E            # V06E released 8 Nov 2023
+AGRMET IMERG version:                      V07B            # V07B released 1 Jun 2024
 AGRMET IMERG Probability Liquid Precip Threshold: 100
 
 # Bratseth runtime settings
@@ -327,6 +328,8 @@ AGRMET cloud data directory:               WWMCA_GRIB      # WWMCA_LE, NONE, or
 # Use WWMCA GRIB1 files beginning 12Z 4 Jul 2020
 AGRMET WWMCA GRIB1 read option:            1
 AGRMET snow distribution shape parameter:  2.6
+AGRMET radiation derived from: GALWEM_RAD # WWMCA turned off Jul 2024
+AGRMET GALWEM radiation data directory: GALWEM
 
 # Legacy AGRMET settings.  Eventually these will be removed,
 # but for now keep these settings.
@@ -362,7 +365,7 @@ AGRMET overcast percentage:                          0.30
 #-----------------------LAND SURFACE MODELS--------------------------
 Noah-MP.4.0.1 model timestep:                15mn
 Noah-MP.4.0.1 restart output interval:       12hr
-Noah-MP.4.0.1 restart file:                  ./input/restarts/LIS_RST_NOAHMP401_202208010000.d01.nc
+Noah-MP.4.0.1 restart file:                  ./input/rstfiles/LIS_RST_NOAHMP401_202406111200.d01.nc
 Noah-MP.4.0.1 restart file format:           netcdf
 Noah-MP.4.0.1 soil parameter table:          ./input/LS_PARAMETERS/noahmp401_parms/SOILPARM.TBL
 Noah-MP.4.0.1 general parameter table:       ./input/LS_PARAMETERS/noahmp401_parms/GENPARM.TBL

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
@@ -25,15 +25,15 @@ Output data format:                     netcdf
 Output naming style:                    "557WW streamflow convention"
 Enable output statistics:               .false.
 Start mode:                             restart
-Starting year:                          2023
-Starting month:                           05
-Starting day:                             31
+Starting year:                          2024
+Starting month:                           06
+Starting day:                             11
 Starting hour:                            12
 Starting minute:                          00
 Starting second:                          00
-Ending year:                            2023
+Ending year:                            2024
 Ending month:                             06
-Ending day:                               01
+Ending day:                               12
 Ending hour:                              00
 Ending minute:                            05
 Ending second:                            00
@@ -97,7 +97,7 @@ Bias estimation restart file:                         none
 #Perturbation options
 Perturbations start mode:                             restart                                    restart                                    restart
 Perturbations restart output interval:  12hr 12hr 12hr
-Perturbations restart filename:  ./input/rstfiles/LIS_DAPERT_202305311200.d01.bin ./input/rstfiles/LIS_DAPERT_202305311200.d01.bin ./input/rstfiles/LIS_DAPERT_202305311200.d01.bin
+Perturbations restart filename:  ./input/rstfiles/LIS_DAPERT_202406111200.d01.bin ./input/rstfiles/LIS_DAPERT_202406111200.d01.bin ./input/rstfiles/LIS_DAPERT_202406111200.d01.bin
 Apply perturbation bias correction:                   1                                          1                                          1
 
 Forcing perturbation algorithm:                       "GMAO scheme"                              "GMAO scheme"                              "GMAO scheme"
@@ -116,10 +116,10 @@ Observation attributes file:                          ./input/attribs/usafsi_att
 Observation perturbation attributes file:             ./input/attribs/usafsi_pertattribs.txt      ./input/attribs/smops_pertattribs.txt     ./input/attribs/smap_pertattribs.txt
 
 
-USAFSI data directory:                                ./input/USAFSI
+USAFSI data directory:                                ./input/USAF_FORCING/USAFSI
 USAFSI netcdf filename prefix:                        USAFSI
 
-SMOPS ASCAT soil moisture data directory:             ./input/SMOPS
+SMOPS ASCAT soil moisture data directory:             ./input/USAF_FORCING/SMOPS
 SMOPS ASCAT naming convention:                        "AGRMET ops"
 SMOPS ASCAT version:                                  "date-based"
 SMOPS ASCAT model CDF file:                           ./input/cdf/noah39_cdf_200obs.nc
@@ -129,7 +129,7 @@ SMOPS ASCAT use realtime data:                                  1
 SMOPS ASCAT soil moisture use scaled standard deviation model:  0
 SMOPS ASCAT CDF read option:                                    1
 
-SMAP(NRT) soil moisture data directory:               ./input/SMAP
+SMAP(NRT) soil moisture data directory:               ./input/USAF_FORCING/SMAP
 SMAP(NRT) model CDF file:                             ./input/cdf/noah39_cdf_200obs.nc
 SMAP(NRT) observation CDF file:                       ./input/cdf/SMAP_cdf_10km_30obs.nc
 SMAP(NRT) soil moisture number of bins in the CDF:              100
@@ -172,11 +172,11 @@ AGRMET forcing domain upper right lon:      179.9296875
 AGRMET forcing domain resolution (dx):        0.1406250
 AGRMET forcing domain resolution (dy):        0.0937500
 
-AGRMET forcing directory:                  ./input/AGRMET
+AGRMET forcing directory:                  ./input/USAF_FORCING
 AGRMET retrospective root filename:        "/PS.AFWA_SC.U_DI.C_DC.ANLYS_GP.LIS_GR.C0P09DEG_AR.GLOBAL_PA.03-HR-SUM_DD."
 
 # Output settings
-AGRMET analysis directory:                 Analysis_UMFG_1 # Change as appropriate
+AGRMET analysis directory:                 ./input/Analysis_UMFG_1 # Change as appropriate
 AGRMET surface fields directory:           SFCALC          # Legacy, will eventually remove
 AGRMET merged precip directory:            PRECIP          # Legacy, will eventually remove
 AGRMET security classification:            U
@@ -235,9 +235,9 @@ AGRMET CMORPH minimum temperature threshold:    273
 # Use IMERG rainfall data
 AGRMET use IMERG data:                     1               # 1 = Use
 AGRMET IMERG temperature threshold:        278
-AGRMET IMERG data directory:               ./input/IMERG/Early_V06B
+AGRMET IMERG data directory:               ./input/USAF_FORCING/IMERG/
 AGRMET IMERG product:                      3B-HHR-E        # Early Run
-AGRMET IMERG version:                      V06E            # V06E released 8 Nov 2023
+AGRMET IMERG version:                      V07B            # V07B released 1 Jun 2024
 AGRMET IMERG Probability Liquid Precip Threshold: 100
 
 # Bratseth runtime settings
@@ -325,6 +325,8 @@ AGRMET cloud data directory:               WWMCA_GRIB           # WWMCA_LE, NONE
 # Use WWMCA GRIB1 files beginning 12Z 4 Jul 2020
 AGRMET WWMCA GRIB1 read option:            1
 AGRMET snow distribution shape parameter:  2.6
+AGRMET radiation derived from: GALWEM_RAD # WWMCA turned off July 2024
+AGRMET GALWEM radiation data directory: GALWEM
 
 # Legacy AGRMET settings.  Eventually these will be removed,
 # but for now keep these settings.
@@ -362,7 +364,7 @@ AGRMET PPT Background bias correction option: 0
 #-----------------------LAND SURFACE MODELS--------------------------
 Noah.3.9 model timestep:                  15mn
 Noah.3.9 restart output interval:         12hr
-Noah.3.9 restart file:                    ./input/rstfiles/LIS_RST_NOAH39_202305311200.d01.nc
+Noah.3.9 restart file:                    ./input/rstfiles/LIS_RST_NOAH39_202406111200.d01.nc
 Noah.3.9 restart file format:             netcdf
 Noah.3.9 vegetation parameter table:      ./input/LS_PARAMETERS/noah39_parms/VEGPARM.TBL
 Noah.3.9 soil parameter table:            ./input/LS_PARAMETERS/noah39_parms/SOILPARM.TBL
@@ -415,13 +417,13 @@ Model output attributes file:           ./input/tables/MODEL_OUTPUT_LIST.TBL.noa
 # ROUTING MODEL:  RAPID
 Routing model:                               "RAPID router"
 
-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 time step:               "3hr"    # Must match 'Surface model output interval:'
+RAPID river routing time step:               "15mn"   # less than routing model time step
 RAPID routing model output interval:         "3hr"
 RAPID routing model restart interval:        "12hr"
 
 RAPID routing model start mode:         restart
-RAPID routing model restart file:       ./input/rstfiles/LIS_RST_RAPID_router_202305311200.d01.nc
+RAPID routing model restart file:       ./input/rstfiles/LIS_RST_RAPID_router_202406111200.d01.nc
 RAPID run in ensemble mode:             1 # 0=open loop; 1=ensemble mean; 2(not support)=ensemble
 
 # Runtime option