Add updating of soil moisture and soil temperature for Noah-MP to global_cycle #834

ClaraDraper-NOAA · 2023-07-07T22:02:45Z

DESCRIPTION OF CHANGES:

Main changes:

Added option to update Noah-MP restarts with increments from the gsi to global_cycle/land_increments
Added option to update soil moisture for Noah-MP only (previously was soil temperature only)
Removed LSM option from namelist, since was redundant with IS_NOAHMP
Replaced the C768.landincsoil test (STC update to Noah restarts) with the C192.landincsoilnoahmp test (SLC, SMC, and STC updates to Noah-MP restarts)

Inputs for new test are on hera:
/scratch2/BMC/gsienkf/Clara.Draper/global_cycle_newtest/input_data_noahmp/

.../input_data/sfcincr_gsi can be deleted (everything else in that directory is still needed)

Example output for new test on hera:
/scratch2/BMC/gsienkf/Clara.Draper/global_cycle_newtest/baseline_data/c192.lndincsoilnoahmp

TESTS CONDUCTED:

All tests used abe5c94.

Compile branch on all Tier 1 machines using Intel (Orion, Jet, Hera and WCOSS2).
Compile branch on Hera using GNU.
Compile branch in 'Debug' mode on WCOSS2.
Run unit tests locally on any Tier 1 machine. (Done on Hera and WCOSS2. All passed.)
Run relevant consistency tests locally on all Tier 1 machine.

Also created the Doxygen on Hera. No warnings were noted.

DEPENDENCIES:

None

DOCUMENTATION:

None.

ISSUE:

Fixes #832

CONTRIBUTORS:

None.

switched mask to use smc not slc (as some restarts have valid slc, and invalid smc).

Set upd_stc and upd_slc from LSM.

…or Noah-MP.

…FS_UTILS into feature/AddNoahmpIncr

GeorgeGayno-NOAA · 2023-07-10T14:44:08Z

@ClaraDraper-NOAA I will look at this today. I can help with testing on machines you can't access.

GeorgeGayno-NOAA · 2023-07-10T14:47:25Z

@WalterKolczynski-NOAA - This PR changes the global_cycle program's NAMCYC namelist. The LSM variable is being removed from that namelist. Does this change affect the global workflow?

WalterKolczynski-NOAA · 2023-07-10T15:09:20Z

@GeorgeGayno-NOAA I don't think so. We're still using the global_cycle.sh from ufs-utils which already seems to not include the setting in its namelist.

reg_tests/global_cycle/C192.lndincsoilnoahmp.sh

GeorgeGayno-NOAA · 2023-07-10T17:31:07Z

I am getting Doxygen warnings in landincrements.f90 for undefined variables/arguments. I got rid of them as follows:

--- a/sorc/global_cycle.fd/land_increments.f90
+++ b/sorc/global_cycle.fd/land_increments.f90
@@ -18,7 +18,7 @@ module land_increments
                                                      !! copied from GFS_typedefs.F90

     ! control state for soil analysis:
-    integer, parameter       :: lsoil_incr=3 ! number of layers to add incrments to
+    integer, parameter       :: lsoil_incr=3 !< number of layers to add incrments to

     real, parameter          :: tfreez=273.16 !< con_t0c  in physcons
 contains
@@ -37,12 +37,17 @@ contains
  !! @param[inout] RLA Latitude on the cubed-sphere tile
  !! @param[inout] RLO Longitude on the cubed-sphere tile
  !! @param[inout] STC_STATE
+ !! @param[inout] SMC_STATE
+ !! @param[inout] SLC_STATE
+ !! @param[out] stc_updated
+ !! @param[out] slc_updated
  !! @param[in] SOILSNOW_TILE Land mask for increments on the cubed-sphere tile
  !! @param[in] SOILSNOW_FG_TILE First guess land mask for increments on the cubed-sphere tile
  !! @param[in] LENSFC Number of land points on a tile
  !! @param[in] LSOIL Number of soil layers
  !! @param[in] IDIM 'I' dimension of a tile
  !! @param[in] JDIM 'J' dimension of a tile
+ !! @param[in] lsm
  !! @param[in] MYRANK MPI rank number
  !!
  !! @author Clara Draper. @date March 2021
@@ -441,8 +446,8 @@ end subroutine calculate_landinc_mask
 !! appropriate max. values for SMC).
 !! Here: adjust (frozen) soil moisture to be consistent with changes in
 !! soil temperature from DA
-
-!> @param[in] lsm Integer code for the LSM
+!!
+!! @param[in] lsm Integer code for the LSM
 !! @param[in] isot Integer code for the soil type data set
 !! @param[in] ivegsrc Integer code for the vegetation type data set
 !! @param[in] lensfc Number of land points for this tile
@@ -453,6 +458,9 @@ end subroutine calculate_landinc_mask
 !! @param[in] stc_adj Analysis soil temperature states
 !! @param[inout] smc_adj Analysis soil moisture states
 !! @param[inout] slc_adj Analysis liquid soil moisture states
+!! @param[in] stc_updated
+!! @param[in] slc_updated
+!! @param[in] zsoil
 !! @author Clara Draper @date April 2021

GeorgeGayno-NOAA · 2023-07-10T18:28:54Z

The global_cycle unit test needs updates:
https://github.com/NOAA-PSL/UFS_UTILS/tree/feature/AddNoahmpIncr/tests/global_cycle

GeorgeGayno-NOAA · 2023-07-10T19:38:26Z

I got the regression tests running on Jet and Orion. And I can run on WCOSS2 when the maintenance ends.

GeorgeGayno-NOAA · 2023-07-10T19:39:18Z

I got the regression tests running on Jet and Orion. And I can run on WCOSS2 when the maintenance ends.

May I check these changes into your branch?

ClaraDraper-NOAA · 2023-07-10T19:54:40Z

I got the regression tests running on Jet and Orion. And I can run on WCOSS2 when the maintenance ends.

May I check these changes into your branch?

Yes, please do! I'm about to look at the unit test now.

GeorgeGayno-NOAA · 2023-07-10T20:27:19Z

I got the regression tests running on Jet and Orion. And I can run on WCOSS2 when the maintenance ends.

May I check these changes into your branch?

Yes, please do! I'm about to look at the unit test now.

I don't have permission to push to your branch. The updated files (for Jet and Orion) are on Hera: /scratch1/NCEPDEV/da/George.Gayno/ufs_utils.git/UFS_UTILS.clara/reg_tests/global_cycle

ClaraDraper-NOAA · 2023-07-10T20:43:11Z

I got the regression tests running on Jet and Orion. And I can run on WCOSS2 when the maintenance ends.

May I check these changes into your branch?

Yes, please do! I'm about to look at the unit test now.

I don't have permission to push to your branch. The updated files (for Jet and Orion) are on Hera: /scratch1/NCEPDEV/da/George.Gayno/ufs_utils.git/UFS_UTILS.clara/reg_tests/global_cycle

I've pushed the updates to the jet and orion driver scripts.

ClaraDraper-NOAA · 2023-07-10T20:52:32Z

I am getting Doxygen warnings in landincrements.f90 for undefined variables/arguments. I got rid of them as follows:

--- a/sorc/global_cycle.fd/land_increments.f90
+++ b/sorc/global_cycle.fd/land_increments.f90
@@ -18,7 +18,7 @@ module land_increments
                                                      !! copied from GFS_typedefs.F90

     ! control state for soil analysis:
-    integer, parameter       :: lsoil_incr=3 ! number of layers to add incrments to
+    integer, parameter       :: lsoil_incr=3 !< number of layers to add incrments to

     real, parameter          :: tfreez=273.16 !< con_t0c  in physcons
 contains
@@ -37,12 +37,17 @@ contains
  !! @param[inout] RLA Latitude on the cubed-sphere tile
  !! @param[inout] RLO Longitude on the cubed-sphere tile
  !! @param[inout] STC_STATE
+ !! @param[inout] SMC_STATE
+ !! @param[inout] SLC_STATE
+ !! @param[out] stc_updated
+ !! @param[out] slc_updated
  !! @param[in] SOILSNOW_TILE Land mask for increments on the cubed-sphere tile
  !! @param[in] SOILSNOW_FG_TILE First guess land mask for increments on the cubed-sphere tile
  !! @param[in] LENSFC Number of land points on a tile
  !! @param[in] LSOIL Number of soil layers
  !! @param[in] IDIM 'I' dimension of a tile
  !! @param[in] JDIM 'J' dimension of a tile
+ !! @param[in] lsm
  !! @param[in] MYRANK MPI rank number
  !!
  !! @author Clara Draper. @date March 2021
@@ -441,8 +446,8 @@ end subroutine calculate_landinc_mask
 !! appropriate max. values for SMC).
 !! Here: adjust (frozen) soil moisture to be consistent with changes in
 !! soil temperature from DA
-
-!> @param[in] lsm Integer code for the LSM
+!!
+!! @param[in] lsm Integer code for the LSM
 !! @param[in] isot Integer code for the soil type data set
 !! @param[in] ivegsrc Integer code for the vegetation type data set
 !! @param[in] lensfc Number of land points for this tile
@@ -453,6 +458,9 @@ end subroutine calculate_landinc_mask
 !! @param[in] stc_adj Analysis soil temperature states
 !! @param[inout] smc_adj Analysis soil moisture states
 !! @param[inout] slc_adj Analysis liquid soil moisture states
+!! @param[in] stc_updated
+!! @param[in] slc_updated
+!! @param[in] zsoil
 !! @author Clara Draper @date April 2021

I've pushed these changes.

ClaraDraper-NOAA · 2023-07-10T20:55:19Z

@GeorgeGayno-NOAA I've updated the unit test code so that the old test now correctly runs. I'll update it tomorrow to test my newly added features (for Noah-MP).

GeorgeGayno-NOAA · 2023-07-11T13:09:00Z

I got the regression tests running on Jet and Orion. And I can run on WCOSS2 when the maintenance ends.

I ran the tests on WCOSS2. Find my script on Hera: /scratch1/NCEPDEV/da/George.Gayno/ufs_utils.git/UFS_UTILS.clara/reg_tests/global_cycle/driver.wcoss2.sh

…gen variables.

GeorgeGayno-NOAA · 2023-07-11T16:54:54Z

@ClaraDraper-NOAA Just a few final checks before I merge.

ClaraDraper-NOAA · 2023-07-11T17:01:18Z

Running to a meeting now, but I have one more update to push (with a new unit test). It's running now, so I'll push it in an hour.

ClaraDraper-NOAA · 2023-07-11T18:06:39Z

I just pushed the updated unit test - from my end, it's ready to merge.

GeorgeGayno-NOAA

Looks good.

ClaraDraper-NOAA added 12 commits June 16, 2023 20:34

write out stc analysis.

583029e

First pass ay applying SMC increments.

9c7106b

Add SMC and STC for Noah-MP, placeholders for Noah-MP model physics.

c2b8d7d

removed redundant check on smc for applying soil increments

b4e70d0

switched mask to use smc not slc (as some restarts have valid slc, and invalid smc).

Set upd_smc to false to match previous code.

de1cf7f

updated rt.sh for my tests.

e142299

Merge branch 'develop' into feature/AddNoahmpIncr

9f73bd7

Removed LSM option from namelist, to avoid duplication with IS_NOAHMP.

4c4fd98

Set upd_stc and upd_slc from LSM.

replaced C768.lndincsoil.sh test with C192.lndincsoilnoahmp.sh test f…

08222de

…or Noah-MP.

replaced C768.lndincsoil.sh test with C192.lndincsoilnoahmp.sh test f…

ce59491

…or Noah-MP.

Merge branch 'feature/AddNoahmpIncr' of https://github.com/NOAA-PSL/U…

7c3d6a5

…FS_UTILS into feature/AddNoahmpIncr

clean-up for pull request.

3bf66a1

GeorgeGayno-NOAA self-requested a review July 10, 2023 12:58

GeorgeGayno-NOAA reviewed Jul 10, 2023

View reviewed changes

reg_tests/global_cycle/C192.lndincsoilnoahmp.sh Show resolved Hide resolved

GeorgeGayno-NOAA reviewed Jul 10, 2023

View reviewed changes

reg_tests/global_cycle/C192.lndincsoilnoahmp.sh Show resolved Hide resolved

Cleaning up C192 test script, in response to George's comments.

dc53476

George's updates to run tests outside hera.

4c29d30

Changes to comments requested by George for Doxygen.

2442d62

Updates to unit test to successfully run the old test.

79917b1

George's script for WCOSS2 tests, and added descriptions for new Doxy…

a190d01

…gen variables.

Updated the unit test for global_cycle to Noah-MP case.

abe5c94

GeorgeGayno-NOAA approved these changes Jul 12, 2023

View reviewed changes

GeorgeGayno-NOAA merged commit 8b7e4a1 into ufs-community:develop Jul 12, 2023

GeorgeGayno-NOAA mentioned this pull request Aug 24, 2023

global_cycle - Support NoahMP and fractional grid #815

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add updating of soil moisture and soil temperature for Noah-MP to global_cycle #834

Add updating of soil moisture and soil temperature for Noah-MP to global_cycle #834

ClaraDraper-NOAA commented Jul 7, 2023 •

edited by GeorgeGayno-NOAA

Loading

GeorgeGayno-NOAA commented Jul 10, 2023

GeorgeGayno-NOAA commented Jul 10, 2023

WalterKolczynski-NOAA commented Jul 10, 2023

GeorgeGayno-NOAA commented Jul 10, 2023

GeorgeGayno-NOAA commented Jul 10, 2023

GeorgeGayno-NOAA commented Jul 10, 2023

GeorgeGayno-NOAA commented Jul 10, 2023

ClaraDraper-NOAA commented Jul 10, 2023

GeorgeGayno-NOAA commented Jul 10, 2023

ClaraDraper-NOAA commented Jul 10, 2023

ClaraDraper-NOAA commented Jul 10, 2023

ClaraDraper-NOAA commented Jul 10, 2023

GeorgeGayno-NOAA commented Jul 11, 2023

GeorgeGayno-NOAA commented Jul 11, 2023

ClaraDraper-NOAA commented Jul 11, 2023

ClaraDraper-NOAA commented Jul 11, 2023

GeorgeGayno-NOAA left a comment

Add updating of soil moisture and soil temperature for Noah-MP to global_cycle #834

Add updating of soil moisture and soil temperature for Noah-MP to global_cycle #834

Conversation

ClaraDraper-NOAA commented Jul 7, 2023 • edited by GeorgeGayno-NOAA Loading

DESCRIPTION OF CHANGES:

TESTS CONDUCTED:

DEPENDENCIES:

DOCUMENTATION:

ISSUE:

CONTRIBUTORS:

GeorgeGayno-NOAA commented Jul 10, 2023

GeorgeGayno-NOAA commented Jul 10, 2023

WalterKolczynski-NOAA commented Jul 10, 2023

GeorgeGayno-NOAA commented Jul 10, 2023

GeorgeGayno-NOAA commented Jul 10, 2023

GeorgeGayno-NOAA commented Jul 10, 2023

GeorgeGayno-NOAA commented Jul 10, 2023

ClaraDraper-NOAA commented Jul 10, 2023

GeorgeGayno-NOAA commented Jul 10, 2023

ClaraDraper-NOAA commented Jul 10, 2023

ClaraDraper-NOAA commented Jul 10, 2023

ClaraDraper-NOAA commented Jul 10, 2023

GeorgeGayno-NOAA commented Jul 11, 2023

GeorgeGayno-NOAA commented Jul 11, 2023

ClaraDraper-NOAA commented Jul 11, 2023

ClaraDraper-NOAA commented Jul 11, 2023

GeorgeGayno-NOAA left a comment

Choose a reason for hiding this comment

ClaraDraper-NOAA commented Jul 7, 2023 •

edited by GeorgeGayno-NOAA

Loading