Converting the CLUBB portable layer

.gitmodules

@@ -27,9 +27,9 @@
         fxDONOTUSEurl = https://github.com/ESCOMP/ALI-ARMS
 
 [submodule "atmos_phys"]
-	path = src/atmos_phys
-	url = https://github.com/ESCOMP/atmospheric_physics
-	fxtag = atmos_phys0_21_003
+        path = src/atmos_phys
+        url = https://github.com/bstephens82/atmospheric_physics
+        fxtag = 64b60e0b514f6b3e84a53151161cc9196734b478 
         fxrequired = AlwaysRequired
         fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
 
@@ -99,14 +99,6 @@
         fxtag = v2.1.9
 	fxDONOTUSEurl = https://github.com/CFMIP/COSPv2.0
 
-[submodule "clubb"]
-	path = src/physics/clubb
-	url = https://github.com/larson-group/clubb_release
-        fxrequired = AlwaysRequired
-        fxsparse = ../.clubb_sparse_checkout
-        fxtag = clubb_4ncar_20260109_ddf5110
-        fxDONOTUSEurl = https://github.com/larson-group/clubb_release
-
 [submodule "ext_co2_cooling"]
 	path = src/physics/ext_co2_cooling
 	url = https://github.com/fedef17/CO2_cool_fort.git

bld/build-namelist

@@ -3536,7 +3536,6 @@ if ($clubb_sgs  =~ /$TRUE/io) {
    }
 
    add_default($nl, 'clubb_l_ascending_grid');
-   add_default($nl, 'clubb_do_icesuper');
    add_default($nl, 'clubb_do_energyfix');
    add_default($nl, 'clubb_cloudtop_cooling');
    add_default($nl, 'clubb_rainevap_turb');
@@ -3626,7 +3625,6 @@ if ($clubb_sgs  =~ /$TRUE/io) {
    add_default($nl, 'clubb_detliq_rad');
    add_default($nl, 'clubb_detphase_lowtemp');
    add_default($nl, 'clubb_do_energyfix');
-   add_default($nl, 'clubb_do_liqsupersat');
    add_default($nl, 'clubb_grid_adapt_in_time_method');
    add_default($nl, 'clubb_fill_holes_type');
    add_default($nl, 'clubb_grid_remap_method');

bld/configure

@@ -2113,11 +2113,11 @@ sub write_filepath
     }
 
     if ($clubb_sgs) {
-       print $fh "$camsrcdir/src/physics/clubb/src/CLUBB_core\n";
+       print $fh "$camsrcdir/src/atmos_phys/schemes/clubb/clubb/src/CLUBB_core\n";
     }
 
     if ($silhs) {
-       print $fh "$camsrcdir/src/physics/clubb/src/SILHS\n";
+       print $fh "$camsrcdir/src/atmos_phys/schemes/clubb/clubb/src/SILHS\n";
     }
 
     if ($phys_pkg eq 'cam7') {
@@ -2150,6 +2150,7 @@ sub write_filepath
     print $fh "$camsrcdir/src/atmos_phys/schemes/cloud_fraction\n";
     print $fh "$camsrcdir/src/atmos_phys/schemes/vertical_diffusion\n";
     print $fh "$camsrcdir/src/atmos_phys/schemes/holtslag_boville\n";
+    print $fh "$camsrcdir/src/atmos_phys/schemes/clubb\n";
 
     # Dynamics package and test utilities
     print $fh "$camsrcdir/src/dynamics/$dyn\n";

bld/namelist_files/namelist_defaults_cam.xml

@@ -2162,7 +2162,6 @@
 <clubb_do_adv                                     > .false. </clubb_do_adv>
 <clubb_timestep                                   > 300.0D0 </clubb_timestep>
 <clubb_rnevap_effic                               > 1.0D0   </clubb_rnevap_effic>
-<clubb_do_icesuper                                > .false. </clubb_do_icesuper>
 <clubb_l_ascending_grid                           > .false. </clubb_l_ascending_grid>
 
 
@@ -2219,7 +2218,6 @@
 <clubb_detliq_rad                                 > 8.0D-6              </clubb_detliq_rad>
 <clubb_detphase_lowtemp                           > 238.15D0            </clubb_detphase_lowtemp>
 <clubb_do_energyfix                               > .true.  </clubb_do_energyfix>
-<clubb_do_liqsupersat                             > .false. </clubb_do_liqsupersat>
 <clubb_gamma_coef                                 > 0.308   </clubb_gamma_coef>
 <clubb_gamma_coef phys="cam7"                     > 0.3     </clubb_gamma_coef>
 <clubb_gamma_coef hgrid="1.9x2.5" phys="cam6"     > 0.280   </clubb_gamma_coef>
@@ -2304,7 +2302,6 @@
 <do_hb_above_clubb phys="cam7"                    >.true.   </do_hb_above_clubb>
 
 <!-- SILHS options -->
-<clubb_do_icesuper                      silhs="1" > .true.  </clubb_do_icesuper>
 <clubb_C2rt                             silhs="1" > 0.2     </clubb_C2rt>
 <clubb_C2thl                            silhs="1" > 0.2     </clubb_C2thl>
 <clubb_C2rtthl                          silhs="1" > 0.2     </clubb_C2rtthl>

bld/namelist_files/namelist_definition.xml

@@ -3714,12 +3714,6 @@ CLUBB timestep, set by build-namelist, do not adjust.
 Rain evaporation efficiency factor.
 </entry>
 
-<entry id="clubb_do_icesuper" type="logical"  category="pblrad"
-       group="clubbpbl_diff_nl" valid_values="" >
-Flag to perform a saturation adjustment for ice which will add ice mass if the
-air is supersaturated with respect to ice.
-</entry>
-
 <!-- CLUBB params namelist -->
 
 <entry id="clubb_beta" type="real" category="pblrad"
@@ -3951,11 +3945,6 @@ Apply adjustments to dry static energy so that CLUBB conserves
 energy.
 </entry>
 
-<entry id="clubb_do_liqsupersat" type="logical"  category="conv"
-       group="clubb_params_nl" valid_values="" >
-Apply liquid supersaturation adjustment code
-</entry>
-
 <entry id="clubb_gamma_coef" type="real" category="pblrad"
        group="clubb_params_nl" valid_values="" >
 Low Skewness in gamma coefficient Skewness Function (units: none)