ESCOMP tag: cam6_4_042

nusbaume · Steve Goldhaber · commit 20ee5eacdbe2 · 2025-02-22T21:53:47.000+01:00
Merge pull request ESCOMP#1169 from PeterHjortLauritzen/std_atm_fix_for_mpas cam6_4_042: Fix reference pressures for MPAS ESCOMP commit: ddacf0f
diff --git a/.github/workflows/fleximod_test.yaml b/.github/workflows/fleximod_test.yaml
@@ -0,0 +1,21 @@
+on: pull_request
+
+jobs:
+  fleximod-test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # oldest supported and latest supported
+        python-version: ["3.7", "3.x"]
+    steps:
+      - id: checkout-CESM
+        uses: actions/checkout@v4
+      - id: run-fleximod
+        run: |
+          $GITHUB_WORKSPACE/bin/git-fleximod update
+          $GITHUB_WORKSPACE/bin/git-fleximod test
+#      - name: Setup tmate session
+#        if: ${{ failure() }}
+#        uses: mxschmitt/action-tmate@v3
+        
+          
diff --git a/.gitmodules b/.gitmodules
@@ -37,13 +37,6 @@
 	fxrequired = AlwaysRequired
 	fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
 
-[submodule "camnor_phys"]
-	path = src/physics/camnor_phys
-	url = https://github.com/NorESMhub/CAM-Nor-physics
-	fxtag = camnor_noresm_v0.0.6
-  fxrequired = AlwaysRequired
-  fxDONOTUSEurl = https://github.com/NorESMhub/CAM-Nor-physics
-
 [submodule "carma"]
 	path = src/physics/carma/base
 	url = https://github.com/ESCOMP/CARMA_base.git
@@ -81,13 +74,6 @@
 	fxrequired = AlwaysRequired
 	fxDONOTUSEurl = https://github.com/ESCOMP/HEMCO_CESM.git
 
-[submodule "oslo_aero"]
-	path = src/chemistry/oslo_aero
-	url = https://github.com/NorESMhub/OSLO_AERO
-	fxtag = oslo_aero_2_5a08d
-	fxrequired = AlwaysRequired
-	fxDONOTUSEurl = https://github.com/NorESMhub/OSLO_AERO.git
-
 [submodule "pumas"]
 	path = src/physics/pumas
 	url = https://github.com/ESCOMP/PUMAS
diff --git a/ccs_config b/ccs_config
@@ -1 +1 @@
-Subproject commit 3640d984aad755c2b536abe2ddbcb428cca130ae
+Subproject commit e4ac80ef142954e582b4065222145352f22cd3a4
diff --git a/cime b/cime
@@ -1 +1 @@
-Subproject commit f4a63723ead19bf5391abf21e5d49bd3741f7e39
+Subproject commit 2776043f0d20d2bc1094afeb48e0cc242b0b0407
diff --git a/components/cdeps b/components/cdeps
@@ -1 +1 @@
-Subproject commit 8b7314b95b9135ddaab31dc28e28baf52ea13841
+Subproject commit f6bc97483a1bfb7352c6c5610a13ed898a86990b
diff --git a/components/cice b/components/cice
@@ -1 +1 @@
-Subproject commit b0bf4fef4aa944c57c0972b66411882e20d3868d
+Subproject commit f14ec8339bc5bc4a7a0664da5e247b5cfda531a1
diff --git a/components/cism b/components/cism
@@ -1 +1 @@
-Subproject commit c05dd5c4fc85327e76523aaea9cfe1e388748928
+Subproject commit c84cc9f5b3103766a35d0a7ddd5e9dbd7deae762
diff --git a/components/clm b/components/clm
@@ -1 +1 @@
-Subproject commit 5e99159e6fcb49b3ebeddf60c33cb7698870b0d3
+Subproject commit 16cf4ac469614f4b329c7da206c3d6b9b773bb03
diff --git a/components/cmeps b/components/cmeps
@@ -1 +1 @@
-Subproject commit 1d456df89ce4a1aefe7cf9f5564c53ebe3dab41f
+Subproject commit 5b7d76978e2fdc661ec2de4ba9834b985decadc6
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,5 +1,74 @@
 ===============================================================
 
+Tag name: cam6_4_042
+Originator(s): pel, nusbaume
+Date: Oct 9, 2024
+One-line Summary: Fix reference pressures in MPAS
+Github PR URL: https://github.com/ESCOMP/CAM/pull/1169
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+- https://github.com/ESCOMP/CAM/issues/1168
+
+Describe any changes made to build system: N/A
+
+Describe any changes made to the namelist: N/A
+
+List any changes to the defaults for the boundary datasets: N/A
+
+Describe any substantial timing or memory changes: N/A
+
+Code reviewed by: nusbaume
+
+List all files eliminated: N/A
+
+List all files added and what they do: N/A
+
+List all existing files that have been modified, and describe the changes:
+
+M       src/dynamics/mpas/dyn_grid.F90
+M       src/utils/std_atm_profile.F90
+ - Use CAM reference pressure instead of standard atmosphere surface pressure.
+
+If there were any failures reported from running test_driver.sh on any test
+platform, and checkin with these failures has been OK'd by the gatekeeper,
+then copy the lines from the td.*.status files for the failed tests to the
+appropriate machine below.  All failed tests must be justified.
+
+derecho/intel/aux_cam:
+
+ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL)
+SMS_Ld1.f09_f09_mg17.FCHIST_GC.derecho_intel.cam-outfrq1d (Overall: DIFF)
+ - pre-existing failure due to HEMCO not having reproducible results issues #1018 and #856
+
+ERP_Ln9_P24x3.f45_f45_mg37.QPWmaC6.derecho_intel.cam-outfrq9s_mee_fluxes (Overall: PEND)
+ERS_Ld3.f10_f10_mg37.F1850.derecho_intel.cam-outfrq1d_14dec_ghg_cam7 (Overall: PEND)
+ERS_Ln9_P36x1.mpasa480_mpasa480.F2000climo.derecho_intel.cam-outfrq9s_mpasa480 (Overall: PEND)
+SMS_Lm13.f10_f10_mg37.F2000climo.derecho_intel.cam-outfrq1m (Overall: PEND)
+  - pre-existing failures due to resource limits due to being switched to run in the 'develop' queue rather than 'main'
+
+SMS_D_Ln9.f19_f19_mg17.FXHIST.derecho_intel.cam-outfrq9s_amie (Overall: PEND)
+SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: PEND)
+ - pre-existing failures due to build-namelist error requiring CLM/CTSM external update.
+
+ERS_Ln9_P288x1.mpasa120_mpasa120.F2000climo.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF)
+ - Expected answer change due to bug-fix in MPAS surface reference pressure.
+
+derecho/nvhpc/aux_cam: ALL PASS
+
+izumi/nag/aux_cam:
+
+DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL)
+ - pre-existing failure -- issue #670
+
+ERC_D_Ln9.mpasa480z32_mpasa480.FHS94.izumi_nag.cam-outfrq3s_usecase (Overall: DIFF)
+ - Expected answer change due to bug-fix in MPAS surface reference pressure.
+
+izumi/gnu/aux_cam: ALL PASS
+
+Summarize any changes to answers: all MPAS tests will likely fail against baselines
+
+===============================================================
+
 Tag name: cam6_4_041
 Originator(s): fvitt
 Date: 16 Oct 2024
diff --git a/libraries/parallelio b/libraries/parallelio
@@ -1 +1 @@
-Subproject commit f52ade075619b32fa141993b5665b0fe099befc2
+Subproject commit 6539ef05ae7584ec570a56fdab9f7dfb336c2b80
diff --git a/share b/share
@@ -1 +1 @@
-Subproject commit b26285a01ba00c2c7f31182708827096b1bf93a8
+Subproject commit f6f31fd61cb8f80aee97311fcca64b3e26b0202c
diff --git a/src/chemistry/oslo_aero b/src/chemistry/oslo_aero
diff --git a/src/dynamics/mpas/dyn_grid.F90 b/src/dynamics/mpas/dyn_grid.F90
@@ -105,6 +105,7 @@ subroutine dyn_grid_init()
    ! coupling code requires constructing global fields for the cell center
    ! grid which is used by the physics parameterizations.
 
+   use hycoef,              only: ps0
    use ref_pres,            only: ref_pres_init
    use std_atm_profile,     only: std_atm_pres
    use time_manager,        only: get_step_size
@@ -141,7 +142,7 @@ subroutine dyn_grid_init()
    ierr = pio_get_att(fh_ini, pio_global, 'sphere_radius', sphere_radius)
 
    ! Compute reference pressures from reference heights.
-   call std_atm_pres(zw, pref_edge)
+   call std_atm_pres(zw, pref_edge, user_specified_ps=ps0)
    pref_mid = (pref_edge(1:plev) + pref_edge(2:plevp)) * 0.5_r8
 
    num_pr_lev = 0
@@ -173,7 +174,7 @@ subroutine dyn_grid_init()
    ! centered grid is used by the physics parameterizations.  The physics
    ! decomposition of the cell centered grid is defined in phys_grid_init.
    call define_cam_grids()
-   
+
 end subroutine dyn_grid_init
 
 !=========================================================================================
@@ -380,7 +381,7 @@ integer function get_dyn_grid_parm(name) result(ival)
       ival = nCells_g
    else if(name == 'plev') then
       ival = plev
-   else	
+   else
       ival = -1
    end if
 
@@ -428,7 +429,7 @@ subroutine dyn_grid_get_elem_coords(ie, rlon, rlat, cdex )
    ! for a field on a dynamics decomposition.  The code in hbuf_accum_addlcltime appears
    ! to also assume that the field is on the physics grid since there is no argument
    ! passed to specify which dynamics grid the coordinates are for.
-   
+
    call endrun(subname//': not implemented for the MPAS grids')
 
 end subroutine dyn_grid_get_elem_coords
@@ -545,7 +546,7 @@ subroutine define_cam_grids()
    use cam_grid_support, only: horiz_coord_t, horiz_coord_create, iMap
    use cam_grid_support, only: cam_grid_register, cam_grid_attribute_register
    use shr_const_mod,    only: PI => SHR_CONST_PI
- 
+
    ! Local variables
    integer :: i, j
 
@@ -600,7 +601,7 @@ subroutine define_cam_grids()
           'degrees_north', 1, nCellsSolve, latCell(1:nCellsSolve)*rad2deg, map=gidx)
    lon_coord => horiz_coord_create('lonCell', 'nCells', nCells_g, 'longitude',     &
           'degrees_east', 1, nCellsSolve, lonCell(1:nCellsSolve)*rad2deg, map=gidx)
- 
+
    allocate(areaWeight(nCellsSolve), stat=ierr)
    if( ierr /= 0 ) call endrun(subname//':failed to allocate area_weight :'//int2str(__LINE__))
    call get_dyn_grid_info(hdim1_d, hdim2_d, num_levels, index_model_top_layer, index_surface_layer, unstructured, dyn_cols)
@@ -667,7 +668,7 @@ subroutine define_cam_grids()
           'degrees_north', 1, nEdgesSolve, latEdge(1:nEdgesSolve)*rad2deg, map=gidx)
    lon_coord => horiz_coord_create('lonEdge', 'nEdges', nEdges_g, 'longitude',     &
           'degrees_east', 1, nEdgesSolve, lonEdge(1:nEdgesSolve)*rad2deg, map=gidx)
- 
+
    ! Map for edge node grid
    allocate(grid_map(3, nEdgesSolve), stat=ierr)
    if( ierr /= 0 ) call endrun(subname//':failed to allocate grid_map array at line:'//int2str(__LINE__))
@@ -704,7 +705,7 @@ subroutine define_cam_grids()
           'degrees_north', 1, nVerticesSolve, latVertex(1:nVerticesSolve)*rad2deg, map=gidx)
    lon_coord => horiz_coord_create('lonVertex', 'nVertices', nVertices_g, 'longitude',     &
           'degrees_east', 1, nVerticesSolve, lonVertex(1:nVerticesSolve)*rad2deg, map=gidx)
- 
+
    ! Map for vertex node grid
    allocate(grid_map(3, nVerticesSolve), stat=ierr)
    if( ierr /= 0 ) call endrun(subname//':failed to allocate grid_map array at line:'//int2str(__LINE__))
@@ -723,7 +724,7 @@ subroutine define_cam_grids()
    nullify(grid_map)
    nullify(lat_coord)
    nullify(lon_coord)
-   
+
 end subroutine define_cam_grids
 
 end module dyn_grid
diff --git a/src/physics/camnor_phys b/src/physics/camnor_phys
diff --git a/src/utils/std_atm_profile.F90 b/src/utils/std_atm_profile.F90
@@ -47,21 +47,33 @@ module std_atm_profile
 real(r8), parameter :: g0 = 9.80665_r8   ! gravitational acceleration (m/s^2)
 real(r8), parameter :: mw = 0.0289644_r8 ! molar mass of dry air (kg/mol)
 real(r8), parameter :: c1 = g0*mw/rg
-  
+
 !=========================================================================================
 CONTAINS
 !=========================================================================================
 
-subroutine std_atm_pres(height, pstd)
-    
+subroutine std_atm_pres(height, pstd, user_specified_ps)
+
    ! arguments
-   real(r8), intent(in)  :: height(:) ! height above sea level in meters
-   real(r8), intent(out) :: pstd(:)   ! std pressure in Pa
-    
-   integer :: i, ii, k, nlev
+   real(r8),           intent(in)  :: height(:) ! height above sea level in meters
+   real(r8),           intent(out) :: pstd(:)   ! std pressure in Pa
+   real(r8), optional, intent(in)  :: user_specified_ps
+
+   integer  :: i, ii, k, nlev
+   integer  :: ierr
+   real(r8) :: pb_local(nreg)
+
    character(len=*), parameter :: routine = 'std_atm_pres'
    !----------------------------------------------------------------------------
-    
+
+   ! Initialize local standard pressure values array
+   pb_local = pb
+
+   ! Set new surface pressure value if provided by the caller
+   if (present(user_specified_ps)) then
+      pb_local(1) = user_specified_ps
+   end if
+
    nlev = size(height)
    do k = 1, nlev
       if (height(k) < 0.0_r8) then
@@ -76,33 +88,32 @@ subroutine std_atm_pres(height, pstd)
             end if
          end do find_region
       end if
-      
+
       if (lb(ii) /= 0._r8) then
-         pstd(k) = pb(ii) * ( tb(ii) / (tb(ii) + lb(ii)*(height(k) - hb(ii)) ) )**(c1/lb(ii))
+         pstd(k) = pb_local(ii) * ( tb(ii) / (tb(ii) + lb(ii)*(height(k) - hb(ii)) ) )**(c1/lb(ii))
       else
-         pstd(k) = pb(ii) * exp( -c1*(height(k) - hb(ii))/tb(ii) )
+         pstd(k) = pb_local(ii) * exp( -c1*(height(k) - hb(ii))/tb(ii) )
       end if
-      
-   end do
 
+   end do
 end subroutine std_atm_pres
 
 !=========================================================================================
 
 subroutine std_atm_height(pstd, height)
-    
+
    ! arguments
    real(r8), intent(in)   :: pstd(:)   ! std pressure in Pa
    real(r8), intent(out)  :: height(:) ! height above sea level in meters
-    
+
    integer :: i, ii, k, nlev
    logical :: found_region
    character(len=*), parameter :: routine = 'std_atm_height'
    !----------------------------------------------------------------------------
-    
+
    nlev = size(height)
    do k = 1, nlev
-      
+
       if (pstd(k) <= pb(nreg)) then
          ii = nreg
       else if (pstd(k) > pb(1)) then
@@ -129,16 +140,16 @@ end subroutine std_atm_height
 !=========================================================================================
 
 subroutine std_atm_temp(height, temp)
-    
+
    ! arguments
    real(r8), intent(in)   :: height(:) ! std pressure in Pa
    real(r8), intent(out)  :: temp(:)   ! temperature
-    
+
    ! local vars
    integer :: i, ii, k, nlev
    character(len=*), parameter :: routine = 'std_atm_temp'
    !----------------------------------------------------------------------------
-    
+
    nlev = size(height)
    do k = 1, nlev
       if (height(k) < 0.0_r8) then
@@ -158,7 +169,7 @@ subroutine std_atm_temp(height, temp)
       else
          temp(k) = tb(ii)
       end if
-      
+
    end do
 
 end subroutine std_atm_temp
