cam6_4_040: Bring in re-organized atmospheric_physics repo

.gitmodules

@@ -35,8 +35,8 @@
 
 [submodule "atmos_phys"]
 	path = src/atmos_phys
-	url = https://github.com/ESCOMP/atmospheric_physics
-        fxtag = atmos_phys0_05_000
+	url = https://github.com/nusbaume/atmospheric_physics
+        fxtag = fbef341
         fxrequired = AlwaysRequired
 	fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
 

bld/configure

@@ -2191,9 +2191,9 @@ sub write_filepath
 
     if ($simple_phys) {
       print $fh "$camsrcdir/src/physics/simple\n";
-      print $fh "$camsrcdir/src/atmos_phys/kessler\n";
-      print $fh "$camsrcdir/src/atmos_phys/held_suarez\n";
-      print $fh "$camsrcdir/src/atmos_phys/tj2016\n";
+      print $fh "$camsrcdir/src/atmos_phys/schemes/kessler\n";
+      print $fh "$camsrcdir/src/atmos_phys/schemes/held_suarez\n";
+      print $fh "$camsrcdir/src/atmos_phys/schemes/tj2016\n";
     }
 
     # Weak scaling fix. This has to come before physics/cam and before dycores
@@ -2332,9 +2332,9 @@ sub write_filepath
     print $fh "$camsrcdir/src/physics/cam\n";
 
     #Add the CCPP'ized subdirectories
-    print $fh "$camsrcdir/src/atmos_phys/tropopause_find\n";
-    print $fh "$camsrcdir/src/atmos_phys/zhang_mcfarlane\n";
-    print $fh "$camsrcdir/src/atmos_phys/dry_adiabatic_adjust\n";
+    print $fh "$camsrcdir/src/atmos_phys/schemes/tropopause_find\n";
+    print $fh "$camsrcdir/src/atmos_phys/schemes/zhang_mcfarlane\n";
+    print $fh "$camsrcdir/src/atmos_phys/schemes/dry_adiabatic_adjust\n";
 
     # Dynamics package and test utilities
     print $fh "$camsrcdir/src/dynamics/$dyn\n";
@@ -2360,7 +2360,7 @@ sub write_filepath
     print $fh "$camsrcdir/src/control\n";
     print $fh "$camsrcdir/src/utils\n";
     print $fh "$camsrcdir/src/utils/cam_ccpp\n";
-    print $fh "$camsrcdir/src/atmos_phys/utilities\n";
+    print $fh "$camsrcdir/src/atmos_phys/schemes/utilities\n";
 
 
     $fh->close;

doc/ChangeLog

@@ -1,3 +1,58 @@
+===============================================================
+
+Tag name:
+Originator(s): nusbaume
+Date: Oct 2, 2024
+One-line Summary: Bring in re-organized atmospheric_physics repo
+Github PR URL: https://github.com/ESCOMP/CAM/pull/1160
+
+Purpose of changes (include the issue number and title text for each relevant
+GitHub issue):
+
+Fixes #1156 -> Modify CAM build system to handle re-organized
+atmospheric_physics repo
+
+Describe any changes made to build system:
+
+Updated the 'configure' script to use the new atmospheric_physics directory
+locations
+
+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:
+
+List all files eliminated: N/A
+
+List all files added and what they do: N/A
+
+List all existing files that have been modified, and describe the changes:
+M       .gitmodules
+ - Update the atmos_phys external
+
+M       bld/configure
+ - Update atmos_phys paths to correctly point to new source code locations
+
+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:
+
+derecho/nvhpc/aux_cam:
+
+izumi/nag/aux_cam:
+
+izumi/gnu/aux_cam: ALL PASS
+
+Summarize any changes to answers: bit-for-bit
+
+===============================================================
+
 Tag name: cam6_4_037
 Originator(s): jimmielin
 Date: Sep 30, 2024