git external repos and derecho updates

fvitt · Apr 4, 2024 · e662e8c · e662e8c
1 parent 6d6843a
commit e662e8c
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 28 deletions.
diff --git a/Externals.cfg b/Externals.cfg
@@ -1,5 +1,5 @@
 [ccs_config]
-tag = ccs_config_cesm0.0.73
+tag = ccs_config_cesm0.0.75
 protocol = git
 repo_url = https://github.com/ESMCI/ccs_config_cesm
 local_path = ccs_config
@@ -57,7 +57,7 @@ local_path = libraries/mct
 required = True
 
 [parallelio]
-tag = pio2_5_10
+tag = pio2_6_2
 protocol = git
 repo_url = https://github.com/NCAR/ParallelIO
 local_path = libraries/parallelio

diff --git a/Externals_CAM.cfg b/Externals_CAM.cfg
@@ -14,23 +14,18 @@ required = True
 
 [cosp2]
 local_path = src/physics/cosp2/src
-protocol = svn
-repo_url = https://github.com/CFMIP/COSPv2.0/tags/
-tag = v2.1.4cesm/src
+protocol = git
+repo_url = https://github.com/CFMIP/COSPv2.0
+sparse = ../.cosp_sparse_checkout
+tag = v2.1.4cesm
 required = True
 
 [clubb]
 local_path = src/physics/clubb
-protocol = svn
-repo_url = https://github.com/larson-group/clubb_release/tags/
-tag = clubb_4ncar_20221129_59cb19f_20230330_branchtag/src/CLUBB_core
-required = True
-
-[silhs]
-local_path = src/physics/silhs
-protocol = svn
-repo_url = https://github.com/larson-group/clubb_release/tags/
-tag = clubb_4ncar_20221129_59cb19f_20230330_branchtag/src/SILHS
+protocol = git
+repo_url = https://github.com/larson-group/clubb_release
+sparse = ../.clubb_sparse_checkout
+tag = clubb_4ncar_20221129_59cb19f_20230330_branchtag
 required = True
 
 [pumas]
@@ -73,7 +68,7 @@ local_path = src/dynamics/mpas/dycore
 protocol = git
 repo_url = https://github.com/fvitt/MPAS-Model.git
 sparse = ../.mpas_sparse_checkout
-branch = cell_grad_ff76a231
+hash = 84475d73d
 required = True
 
 [hemco]

diff --git a/bld/configure b/bld/configure
@@ -2204,11 +2204,11 @@ sub write_filepath
     }
 
     if ($clubb_sgs) {
-       print $fh "$camsrcdir/src/physics/clubb\n";
+       print $fh "$camsrcdir/src/physics/clubb/src/CLUBB_core\n";
     }
 
     if ($silhs) {
-       print $fh "$camsrcdir/src/physics/silhs\n";
+       print $fh "$camsrcdir/src/physics/clubb/src/SILHS\n";
     }
 
     if ($phys_pkg eq 'cam_dev') {

diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml
@@ -267,7 +267,7 @@
 
 <ncdata dyn="se" hgrid="ne5np4"   nlev="66"           ic_ymd="101">atm/waccm/ic/wa3_ne5np4_1950_spinup.cam2.i.1960-01-01-00000_c150810.nc</ncdata>
 <ncdata dyn="se" hgrid="ne30np4"  nlev="70"           ic_ymd="101">atm/waccm/ic/FW2000_ne30_L70_01-01-0001_c200602.nc</ncdata>
-<ncdata dyn="se" hgrid="ne30np4"  nlev="70"  npg="3" chem="waccm_sc_mam4">atm/waccm/ic/FWsc2000climo_ne30pg3_L70_0002-01-01_c221103.nc</ncdata>
+<ncdata dyn="se" hgrid="ne30np4"  nlev="70"  npg="3" chem="waccm_sc_mam4">atm/waccm/ic/FW2000.ne30pg3_ne30pg3_nlev70_c230906.nc</ncdata>
 <ncdata dyn="se" hgrid="ne30np4"  nlev="70"  npg="3"  ic_ymd="101">atm/waccm/ic/FW2000.ne30pg3_ne30pg3_nlev70_c230906.nc</ncdata>
 <ncdata dyn="se" hgrid="ne30np4"  nlev="110"          ic_ymd="101">atm/waccm/ic/FWsc2000_ne30pg3_L110_01-01-0001_c200521.nc</ncdata>
 

diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
@@ -278,6 +278,26 @@
 	</nthrds>
       </pes>
     </mach>
+    <mach name="derecho">
+      <pes pesize="any" compset="_CAM60%WCSC">
+	<ntasks>
+	  <ntasks_atm>-4</ntasks_atm>
+	  <ntasks_lnd>-4</ntasks_lnd>
+	  <ntasks_rof>-4</ntasks_rof>
+	  <ntasks_ice>-4</ntasks_ice>
+	  <ntasks_ocn>-4</ntasks_ocn>
+	  <ntasks_cpl>-4</ntasks_cpl>
+	</ntasks>
+	<nthrds>
+	  <nthrds_atm>1</nthrds_atm>
+	  <nthrds_lnd>1</nthrds_lnd>
+	  <nthrds_rof>1</nthrds_rof>
+	  <nthrds_ice>1</nthrds_ice>
+	  <nthrds_ocn>1</nthrds_ocn>
+	  <nthrds_cpl>1</nthrds_cpl>
+	</nthrds>
+      </pes>
+    </mach>
   </grid>
   <grid name="a%ne16" >
     <mach name="cheyenne">

diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml
@@ -730,7 +730,7 @@
     <machines>
       <machine name="cheyenne" compiler="intel" category="prealpha"/>
       <machine name="cheyenne" compiler="intel" category="waccm"/>
-      <machine name="cheyenne" compiler="intel" category="frontogw_mpas"/>
+      <machine name="derecho" compiler="intel" category="frontogw_mpas"/>
       <machine name="cheyenne" compiler="intel" category="tem_diags"/>
    </machines>
     <options>
@@ -2136,7 +2136,7 @@
 
   <test compset="FWsc2000climo" grid="mpasa120_mpasa120" name="SMS_D_Ln9_Vnuopc" testmods="cam/outfrq9s_mpasa120">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="frontogw_mpas"/>
+      <machine name="derecho" compiler="intel" category="frontogw_mpas"/>
       <machine name="cheyenne" compiler="intel" category="waccm"/>
     </machines>
     <options>
@@ -2145,7 +2145,7 @@
   </test>
   <test compset="FWsc2000climo" grid="mpasa120_mpasa120" name="ERS_Ln9_Vnuopc" testmods="cam/outfrq9s_mpasa120">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="frontogw_mpas"/>
+      <machine name="derecho" compiler="intel" category="frontogw_mpas"/>
       <machine name="cheyenne" compiler="intel" category="waccm"/>
     </machines>
     <options>

diff --git a/src/dynamics/fv/dp_coupling.F90 b/src/dynamics/fv/dp_coupling.F90
@@ -571,7 +571,12 @@ subroutine d_p_coupling(grid, phys_state, phys_tend,  pbuf2d, dyn_out)
              end if
           end do
        end do
-
+       !
+       ! Convert dry type constituents from moist to dry mixing ratio
+       ! (note: cam_thermo_dry_air_update assumes dry unless optianal conversion factor provided)
+       !
+       call set_state_pdry(phys_state(lchnk))    ! First get dry pressure to use for this timestepxxx
+       call set_wet_to_dry(phys_state(lchnk))    ! Dynamics had moist, physics wants dry. xxx
        if (dry_air_species_num>0) then
 !------------------------------------------------------------
 ! Apply limiters to mixing ratios of major species
@@ -608,11 +613,6 @@ subroutine d_p_coupling(grid, phys_state, phys_tend,  pbuf2d, dyn_out)
        end do
 
 !
-! Convert dry type constituents from moist to dry mixing ratio
-!
-       call set_state_pdry(phys_state(lchnk))    ! First get dry pressure to use for this timestep
-       call set_wet_to_dry(phys_state(lchnk))    ! Dynamics had moist, physics wants dry.
-!
 ! Ensure tracers are all positive
 !
        call qneg3('D_P_COUPLING',lchnk  ,ncol    ,pcols   ,pver    , &

diff --git a/src/physics/.clubb_sparse_checkout b/src/physics/.clubb_sparse_checkout
@@ -0,0 +1,2 @@
+src/CLUBB_core
+src/SILHS
diff --git a/src/physics/cosp2/.cosp_sparse_checkout b/src/physics/cosp2/.cosp_sparse_checkout
@@ -0,0 +1 @@
+/src/