Merge pull request #1011 from fvitt/zz_cam6_3_018_mosaic_externals

MOSAIC branch externals

Externals.cfg

@@ -9,14 +9,14 @@ local_path = components/cice
 required = True
 
 [cime]
-tag = cime5.8.48
+tag = cime5.8.32.9
 protocol = git
 repo_url = https://github.com/ESMCI/cime
 local_path = cime
 required = True
 
 [cism]
-tag = cism2_1_69
+tag = cism2_1_69_b
 protocol = git
 repo_url = https://github.com/ESCOMP/cism-wrapper
 local_path = components/cism

Externals_CAM.cfg

@@ -1,22 +1,23 @@
 [chem_proc]
 local_path = chem_proc
-protocol = svn
-repo_url = https://svn-ccsm-models.cgd.ucar.edu/tools/proc_atm/chem_proc/release_tags
+protocol = git
+repo_url = https://github.com/ESCOMP/CHEM_PREPROCESSOR.git
 tag = chem_proc5_0_04
 required = True
 
 [carma]
 local_path = src/physics/carma/base
-protocol = svn
-repo_url = https://svn-ccsm-models.cgd.ucar.edu/carma/release_tags
-tag = carma3_49_rel
+protocol = git
+repo_url = https://github.com/ESCOMP/CARMA_base.git
+tag = carma3_49
 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]
@@ -64,4 +65,3 @@ required = True
 
 [externals_description]
 schema_version = 1.0.0
-

bld/build-namelist

@@ -920,12 +920,12 @@ if ($aer_model eq 'mam' ) {
   my @mode_spec_src;
   my %modal_groups;
   my %modal_species;
-  
+
   # MOSAIC (dsj)
   my $mosaic = $cfg->get('mosaic');
   if ($mosaic) {
     if ($aero_modes eq '4mode' ) {
-      my %modal_species = ( 'so4'=>'sulfate',
+      %modal_species = ( 'so4'=>'sulfate',
                             'no3'=>'nitrate',
                             'nh4'=>'ammonium',
                             'pom'=>'p-organic',
@@ -942,15 +942,14 @@ if ($aer_model eq 'mam' ) {
     }
   }
   else {
-    my %modal_species = ( 'so4'=>'sulfate',
+    %modal_species = ( 'so4'=>'sulfate',
                           'nh4'=>'ammonium',
                           'pom'=>'p-organic',
                           'soa'=>'s-organic',
                           'bc' =>'black-c',
                           'dst'=>'dust',
                           'ncl'=>'seasalt' );
   }
-
 
   if ($aero_modes eq '3mode' ) {
     # MAM rad_climate settings.  The externally mixed quantities in the modal aerosol
@@ -2814,7 +2813,7 @@ if ($waccmx) {
   add_default($nl,'oplus_ring_polar_filter');
 }
 
-# Chemistry options 
+# Chemistry options
 # MOSAIC (dsj)
 my $mosaic = $cfg->get('mosaic');
 if ($mosaic) {

src/physics/cosp2/.cosp_sparse_checkout

@@ -0,0 +1 @@
+/src/