cam6_3_146: ZM clean up in preparation for using via CCPP and remove zmconv_microp feature

Externals_CAM.cfg

@@ -55,9 +55,9 @@ tag = ALI_ARMS_v1.0.0
 required = True
 
 [atmos_phys]
-tag = atmos_phys0_00_011
+tag = 7883a29d4c
 protocol = git
-repo_url = https://github.com/NCAR/atmospheric_physics
+repo_url = https://github.com/cacraigucar/atmospheric_physics
 required = True
 local_path = src/atmos_phys
 

bld/build-namelist

@@ -3474,7 +3474,6 @@ if (!$simple_phys) {
     add_default($nl, 'zmconv_ke');
     add_default($nl, 'zmconv_ke_lnd');
     add_default($nl, 'zmconv_org');
-    add_default($nl, 'zmconv_microp');
     add_default($nl, 'zmconv_num_cin');
     add_default($nl, 'zmconv_dmpdz');
     add_default($nl, 'zmconv_tiedke_add');

bld/configure

@@ -1802,6 +1802,9 @@ if ($usr_cppdefs and $print>=2) { print "Commandline CPP definitions: \'$usr_cpp
 # the CPP definitions that were explicitly set in the defaults file or by the user on the commandline.
 my $cfg_cppdefs = ' ';
 
+# Turn on CCPP "OLD_CAM"
+$cfg_cppdefs .= " -DOLD_CAM";
+
 # Building for perturbation growth tests
 if ($pergro eq "ON") { $cfg_cppdefs .= " -DPERGRO"; }
 
@@ -2246,6 +2249,9 @@ sub write_filepath
     # in the list of filepaths.
     print $fh "$camsrcdir/src/physics/cam\n";
 
+    #Add the CCPP'ized subdirectories
+    print $fh "$camsrcdir/src/atmos_phys/zm\n";
+
     # Dynamics package and test utilities
     print $fh "$camsrcdir/src/dynamics/$dyn\n";
     if($dyn eq 'se') {

bld/namelist_files/namelist_defaults_cam.xml

@@ -2767,7 +2767,6 @@
 <zmconv_org                                                           > .false. </zmconv_org>
 <zmconv_org                                        zmconv_org="1"     > .true.  </zmconv_org>
 
-<zmconv_microp                                                        > .false. </zmconv_microp>
 <zmconv_num_cin                                                       > 5       </zmconv_num_cin>
 <zmconv_num_cin                                       phys="cam6"     > 1       </zmconv_num_cin>
 <zmconv_num_cin                                       phys="cam_dev"  > 1       </zmconv_num_cin>

bld/namelist_files/namelist_definition.xml

@@ -3197,12 +3197,6 @@ if -zmconv_org is set in configure.
 Default: .false., unless -zmconv_org set in configure
 </entry>
 
-<entry id="zmconv_microp" type="logical" category="conv"
-       group="zmconv_nl" valid_values="" >
-Turn on convective microphysics
-Default: .false.
-</entry>
-
 <entry id="zmconv_num_cin" type="integer" category="conv"
        group="zmconv_nl" valid_values="" >
 The number of negative buoyancy regions that are allowed before the convection top and CAPE calculations are completed.

cime_config/testdefs/testlist_cam.xml

@@ -519,16 +519,6 @@
       <option name="wallclock">00:30:00</option>
     </options>
   </test>
-<!--              367                         -->
-  <test compset="QPC6" grid="f10_f10_mg37" name="ERC_D_Ln9_Vnuopc" testmods="cam/outfrq3s_convmic">
-    <machines>
-      <machine name="izumi" compiler="nag" category="aux_cam"/>
-    </machines>
-    <options>
-      <option name="comment" >367 tsm, ter</option>
-      <option name="wallclock">00:30:00</option>
-    </options>
-  </test>
 <!--              368                         -->
   <test compset="QPC6" grid="f10_f10_mg37" name="ERC_D_Ln9_Vnuopc" testmods="cam/outfrq3s">
     <machines>