Bring in new atmospheric_physics tag and use CCPPized shortwave interfaces

.gitmodules

@@ -28,8 +28,8 @@
 
 [submodule "atmos_phys"]
 	path = src/atmos_phys
-	url = https://github.com/ESCOMP/atmospheric_physics
-        fxtag = atmos_phys0_16_002
+	url = https://github.com/peverwhee/atmospheric_physics
+	fxtag = 3f9deba76f7a60367e5eb4dad4e94bfac1d1ef88
         fxrequired = AlwaysRequired
 	fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
 
@@ -76,13 +76,6 @@
         fxrequired = AlwaysRequired
 	fxDONOTUSEurl = https://github.com/ESCOMP/HEMCO_CESM.git
 
-[submodule "rte-rrtmgp"]
-	path = src/physics/rrtmgp/ext
-	url = https://github.com/earth-system-radiation/rte-rrtmgp.git
-        fxrequired = AlwaysRequired
-	fxtag = v1.9.2
-        fxDONOTUSEurl = https://github.com/earth-system-radiation/rte-rrtmgp.git
-
 [submodule "rrtmgp-data"]
 	path = src/physics/rrtmgp/data
 	url = https://github.com/earth-system-radiation/rrtmgp-data.git

bld/configure

@@ -2138,16 +2138,16 @@ sub write_filepath
     }
     elsif ($rad eq 'rrtmgp') {
         print $fh "$camsrcdir/src/physics/rrtmgp\n";
-        print $fh "$camsrcdir/src/physics/rrtmgp/ext/extensions\n";
-        print $fh "$camsrcdir/src/physics/rrtmgp/ext/gas-optics\n";
-        print $fh "$camsrcdir/src/physics/rrtmgp/ext/rrtmgp-frontend\n";
-        print $fh "$camsrcdir/src/physics/rrtmgp/ext/rte-frontend\n";
+        print $fh "$camsrcdir/src/atmos_phys/schemes/rrtmgp/ext/extensions\n";
+        print $fh "$camsrcdir/src/atmos_phys/schemes/rrtmgp/ext/gas-optics\n";
+        print $fh "$camsrcdir/src/atmos_phys/schemes/rrtmgp/ext/rrtmgp-frontend\n";
+        print $fh "$camsrcdir/src/atmos_phys/schemes/rrtmgp/ext/rte-frontend\n";
         if ($use_rrtmgp_gpu) {
-            print $fh "$camsrcdir/src/physics/rrtmgp/ext/rrtmgp-kernels/accel\n";
-            print $fh "$camsrcdir/src/physics/rrtmgp/ext/rte-kernels/accel\n";
+            print $fh "$camsrcdir/src/atmos_phys/schemes/rrtmgp/ext/rrtmgp-kernels/accel\n";
+            print $fh "$camsrcdir/src/atmos_phys/schemes/rrtmgp/ext/rte-kernels/accel\n";
         }
-        print $fh "$camsrcdir/src/physics/rrtmgp/ext/rrtmgp-kernels\n";
-        print $fh "$camsrcdir/src/physics/rrtmgp/ext/rte-kernels\n";
+        print $fh "$camsrcdir/src/atmos_phys/schemes/rrtmgp/ext/rrtmgp-kernels\n";
+        print $fh "$camsrcdir/src/atmos_phys/schemes/rrtmgp/ext/rte-kernels\n";
         print $fh "$camsrcdir/src/atmos_phys/schemes/rrtmgp\n";
         print $fh "$camsrcdir/src/atmos_phys/schemes/rrtmgp/objects\n";
     }