Merge pull request #1372 from peverwhee/rrtmgp-sw

cam6_4_119: Bring in new atmospheric_physics tag and use CCPPized shortwave interfaces

Author: peverwhee

.gitmodules

@@ -29,7 +29,7 @@
 [submodule "atmos_phys"]
 	path = src/atmos_phys
 	url = https://github.com/ESCOMP/atmospheric_physics
-	fxtag = atmos_phys0_17_002
+	fxtag = atmos_phys0_17_003
         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";
     }

doc/ChangeLog

@@ -1,3 +1,64 @@
+===============================================================
+
+Tag name: cam6_4_119
+Originator: peverwhee
+Date: 26 September, 2025
+One-line Summary: Bring in new atmospheric_physics tag and use CCPPized shortwave interfaces
+Github PR URL: https://github.com/ESCOMP/CAM/pull/1372
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+Part of "Conversion of RRTMGP to CCPP" (#1192)
+- Modifies the interfaces in radiation.F90
+- Moves rrtmgp external to atmospheric_physics (schemes/rrtmgp/ext)
+
+Describe any changes made to build system:
+
+M    bld/configure
+- update paths to RRTMGP external
+
+Describe any changes made to the namelist: N/A
+
+List any changes to the defaults for the boundary datasets: N/A
+
+Describe any substantial timing or memory changes: N/A
+
+Code reviewed by: nusbaume
+
+List all files eliminated:
+
+D    src/physics/rrtmgp/ext
+- move submodule to atmospheric_physics
+
+D    src/physics/rrtmgp/rad_solar_var.F90
+- ccppized and moved to schemes/rrtmgp/rrtmgp_sw_solar_var.F90
+
+List all files added and what they do: N/A
+
+List all existing files that have been modified, and describe the changes:
+
+M     src/atmos_phys
+- updated submodule
+
+M     src/physics/rrtmgp/radiation.F90
+- update interface to use CCPPized schemes
+
+M     src/physics/rrtmgp/rrtmgp_inputs_cam.F90
+- ccppize and move sw gas optics and cloud optics
+
+If there were any failures reported from running test_driver.sh on any test
+platform, and checkin with these failures has been OK'd by the gatekeeper,
+then copy the lines from the td.*.status files for the failed tests to the
+appropriate machine below.  All failed tests must be justified.
+
+derecho/intel/aux_cam: all BFB
+
+derecho/nvhpc/aux_cam:
+  ERS_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_nvhpc.cam-outfrq9s_gpu_default
+     - pre-existing failure- See issue: https://github.com/ESCOMP/CAM/issues/1383
+
+izumi/nag/aux_cam: all BFB
+
+izumi/gnu/aux_cam: all BFB
 
 ===============================================================