Merge branch 'cam_development' into CESM-GC_rebased_on_cam6_0_034

ESCOMP · Nov 17, 2022 · 74bb99d · 74bb99d
2 parents 6553464 + 86578bd
commit 74bb99d
Show file tree

Hide file tree

Showing 111 changed files with 10,289 additions and 5,779 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ chem_proc
 cime
 components
 manage_externals.log
+src/physics/ali_arms/
 src/physics/carma/base
 src/physics/clubb
 src/physics/cosp2/src

diff --git a/Externals.cfg b/Externals.cfg
@@ -1,5 +1,5 @@
 [ccs_config]
-tag = ccs_config_cesm0.0.28
+tag = ccs_config_cesm0.0.45
 protocol = git
 repo_url = https://github.com/ESMCI/ccs_config_cesm
 local_path = ccs_config
@@ -21,7 +21,7 @@ externals = Externals.cfg
 required = True
 
 [cmeps]
-tag = cmeps0.13.65
+tag = cmeps0.13.70
 protocol = git
 repo_url = https://github.com/fvitt/CMEPS.git
 local_path = components/cmeps
@@ -36,14 +36,14 @@ externals =  Externals_CDEPS.cfg
 required = True
 
 [cpl7]
-branch = dep_data_file
+tag = cpl7.0.14
 protocol = git
 repo_url = https://github.com/fvitt/CESM_CPL7andDataComps
 local_path = components/cpl7
 required = True
 
 [share]
-tag = share1.0.11
+tag = share1.0.12
 protocol = git
 repo_url = https://github.com/ESCOMP/CESM_share
 local_path = share
@@ -57,7 +57,7 @@ local_path = libraries/mct
 required = True
 
 [parallelio]
-tag = pio2_5_7
+tag = pio2_5_9
 protocol = git
 repo_url = https://github.com/NCAR/ParallelIO
 local_path = libraries/parallelio

diff --git a/Externals_CAM.cfg b/Externals_CAM.cfg
@@ -37,7 +37,7 @@ required = True
 local_path = src/physics/pumas
 protocol = git
 repo_url = https://github.com/ESCOMP/PUMAS
-tag = pumas_cam-release_v1.25
+tag = pumas_cam-release_v1.27
 required = True
 
 [pumas-frozen]
@@ -47,6 +47,13 @@ repo_url = https://github.com/ESCOMP/PUMAS
 tag = pumas_cam-release_v1.17_rename
 required = True
 
+[ali_arms]
+local_path = src/physics/ali_arms
+protocol = git
+repo_url = https://github.com/ESCOMP/ALI-ARMS
+tag = ALI_ARMS_v1.0.0
+required = True
+
 [atmos_phys]
 tag = atmos_phys0_00_011
 protocol = git

diff --git a/bld/build-namelist b/bld/build-namelist
@@ -1657,7 +1657,8 @@ if ($chem =~ /waccm_sc/) {
         add_default($nl, 'waccm_forcing_type', 'val'=>'CYCLICAL');
         add_default($nl, 'waccm_forcing_cycle_yr');
     }
-    add_default($nl, 'nlte_use_mo', 'val'=>".false.");
+    add_default($nl, 'nlte_use_mo',      'val'=>".false.");
+    add_default($nl, 'nlte_use_aliarms', 'val'=>".false.");
     add_default($nl, 'h2orates');
     add_default($nl, 'solar_parms_data_file');
 }
@@ -2673,6 +2674,17 @@ if ($maxzen>0.0) {
     add_default($nl, 'photo_max_zen', 'val'=>"${maxzen}D0");
 }
 
+# upper boundary specifier
+my $ubc_ver;
+if (($chem =~ /waccm_ma/ or $chem =~ /waccm_tsmlt/ ) and !$waccmx) {
+    $ubc_ver = 'waccmchem';
+} elsif ($chem =~ /waccm_sc/) {
+    $ubc_ver = 'waccmsc';
+}
+if (defined $ubc_ver) {
+    add_default($nl, 'ubc_specifier', 'ver'=>$ubc_ver);
+}
+
 # WACCM options.
 if ($chem =~ /waccm_ma/ or $chem =~ /waccm_tsmlt/) {
 

diff --git a/bld/configure b/bld/configure
@@ -2261,6 +2261,10 @@ sub write_filepath
 	print $fh "$camsrcdir/src/physics/pumas-frozen\n";
     }
 
+    print $fh "$camsrcdir/src/physics/ali_arms\n";
+    print $fh "$camsrcdir/src/physics/ali_arms/subs\n";
+    print $fh "$camsrcdir/src/physics/ali_arms/include\n";
+
     # Superparameterization
     if ($phys_pkg eq 'spcam_m2005' or $phys_pkg eq 'spcam_sam1mom') {
         print $fh "$camsrcdir/src/physics/spcam\n";

diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml
@@ -1771,6 +1771,12 @@
 <!-- WACCM Upper boundary conditions -->
 <tgcm_ubc_file>atm/waccm/ub/tgcm_ubc_1993_c100204.nc</tgcm_ubc_file>
 <snoe_ubc_file>atm/waccm/ub/snoe_eof.nc</snoe_ubc_file>
+<ubc_specifier ver="waccmchem">
+  'T->MSIS','Q->2.d-8vmr','CH4->2.d-10vmr','F->1.0D-15mmr','HF->1.0D-15mmr','H->MSIS','N->MSIS','O->MSIS','O2->MSIS','H2->TGCM','NO->SNOE'
+</ubc_specifier>
+<ubc_specifier ver="waccmsc">
+  'T->MSIS','Q->2.d-8vmr','CH4->2.d-10vmr'
+</ubc_specifier>
 
 <!-- Boundary data for Tropopheric Chemistry -->
 <fstrat_file    >atm/cam/chem/trop_mozart/ub/ubvals_b40.20th.track1_1996-2005_c110315.nc</fstrat_file>