Merge pull request ESCOMP#913 from jedwards4b/remove_svn_sparse_check…

…outs

cam6_3_135: removes svn sparse checkout

Externals_CAM.cfg

@@ -14,23 +14,18 @@ required = True
 
 [cosp2]
 local_path = src/physics/cosp2/src
-protocol = svn
-repo_url = https://github.com/CFMIP/COSPv2.0/tags/
-tag = v2.1.4cesm/src
+protocol = git
+repo_url = https://github.com/CFMIP/COSPv2.0
+sparse = ../.cosp_sparse_checkout
+tag = v2.1.4cesm
 required = True
 
 [clubb]
 local_path = src/physics/clubb
-protocol = svn
-repo_url = https://github.com/larson-group/clubb_release/tags/
-tag = clubb_4ncar_20221129_59cb19f_20230330_branchtag/src/CLUBB_core
-required = True
-
-[silhs]
-local_path = src/physics/silhs
-protocol = svn
-repo_url = https://github.com/larson-group/clubb_release/tags/
-tag = clubb_4ncar_20221129_59cb19f_20230330_branchtag/src/SILHS
+protocol = git
+repo_url = https://github.com/larson-group/clubb_release
+sparse = ../.clubb_sparse_checkout
+tag = clubb_4ncar_20221129_59cb19f_20230330_branchtag
 required = True
 
 [pumas]

bld/configure

@@ -2204,11 +2204,11 @@ sub write_filepath
     }
 
     if ($clubb_sgs) {
-       print $fh "$camsrcdir/src/physics/clubb\n";
+       print $fh "$camsrcdir/src/physics/clubb/src/CLUBB_core\n";
     }
 
     if ($silhs) {
-       print $fh "$camsrcdir/src/physics/silhs\n";
+       print $fh "$camsrcdir/src/physics/clubb/src/SILHS\n";
     }
 
     if ($phys_pkg eq 'cam_dev') {
@@ -2305,13 +2305,13 @@ sub write_cosp_makefile
 
 CAM_BLD      := $cam_bld
 COSP_PATH    := $cam_dir/src/physics/cosp2
-ISCCP_PATH   := $cam_dir/src/physics/cosp2/src/simulator/icarus
-RS_PATH      := $cam_dir/src/physics/cosp2/src/simulator/quickbeam
-RT_PATH      := $cam_dir/src/physics/cosp2/src/simulator/rttov
-CS_PATH      := $cam_dir/src/physics/cosp2/src/simulator/actsim
-MISR_PATH    := $cam_dir/src/physics/cosp2/src/simulator/MISR_simulator
-MODIS_PATH   := $cam_dir/src/physics/cosp2/src/simulator/MODIS_simulator
-PARASOL_PATH := $cam_dir/src/physics/cosp2/src/simulator/parasol
+ISCCP_PATH   := $cam_dir/src/physics/cosp2/src/src/simulator/icarus
+RS_PATH      := $cam_dir/src/physics/cosp2/src/src/simulator/quickbeam
+RT_PATH      := $cam_dir/src/physics/cosp2/src/src/simulator/rttov
+CS_PATH      := $cam_dir/src/physics/cosp2/src/src/simulator/actsim
+MISR_PATH    := $cam_dir/src/physics/cosp2/src/src/simulator/MISR_simulator
+MODIS_PATH   := $cam_dir/src/physics/cosp2/src/src/simulator/MODIS_simulator
+PARASOL_PATH := $cam_dir/src/physics/cosp2/src/src/simulator/parasol
 
 EOF
 

doc/ChangeLog

@@ -1,5 +1,80 @@
 ===============================================================
 
+Tag name: cam6_3_135
+Originator(s): jedwards, nusbaume
+Date: 16 Nov 2023
+One-line Summary: removes svn sparse checkout
+Github PR URL: https://github.com/ESCOMP/CAM/pull/913
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+
+Use git sparse checkout for all repos, combine clubb and silhs into clubb.
+git sparse checkout has been available in manage_externals since version 1.2.1.
+
+Fixes #912 -> cosp2 svn access to github support is ending soon
+
+Describe any changes made to build system:
+
+Build path were modified in the "configure" Perl script, as well
+as in the COSP Makefile.in file, in order to account for the
+new source code paths.
+
+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, cacraigucar, gold2718
+
+List all files eliminated: N/A
+
+List all files added and what they do:
+
+A       src/physics/.clubb_sparse_checkout
+ - Provides information on how to do the git sparse checkout of CLUBB and SILHS
+
+A       src/physics/cosp2/.cosp_sparse_checkout
+ - Provides information on how to do the git sparse checkout of COSP
+
+List all existing files that have been modified, and describe the changes:
+
+M       Externals_CAM.cfg
+ - Change the Github-SVN bridge method to git sparse checkout
+
+M       bld/configure
+ - Update source code paths for CLUBB, SILHS, and COSP
+
+M       src/physics/cosp2/Makefile.in
+ - Update source code paths for relevant COSP files.
+
+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.
+
+cheyenne/intel/aux_cam:
+
+ ERP_Ln9_Vnuopc.C96_C96_mg17.F2000climo.cheyenne_intel.cam-outfrq9s_mg3 (Overall: FAIL) details:
+    FAIL ERP_Ln9_Vnuopc.C96_C96_mg17.F2000climo.cheyenne_intel.cam-outfrq9s_mg3 MODEL_BUILD time=3
+ ERP_Ln9_Vnuopc.f09_f09_mg17.FCSD_HCO.cheyenne_intel.cam-outfrq9s (Overall: FAIL) details:
+    FAIL ERP_Ln9_Vnuopc.f09_f09_mg17.FCSD_HCO.cheyenne_intel.cam-outfrq9s COMPARE_base_rest
+ SMS_Lh12_Vnuopc.f09_f09_mg17.FCSD_HCO.cheyenne_intel.cam-outfrq3h (Overall: DIFF) details:
+    FAIL SMS_Lh12_Vnuopc.f09_f09_mg17.FCSD_HCO.cheyenne_intel.cam-outfrq3h BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_134: DIFF
+ - pre-existing failure
+
+izumi/nag/aux_cam:
+
+ DAE_Vnuopc.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL) details:
+    FAIL DAE_Vnuopc.f45_f45_mg37.FHS94.izumi_nag.cam-dae RUN time=10
+ - pre-existing failure
+
+izumi/gnu/aux_cam: ALL PASS
+
+Summarize any changes to answers: bit-for-bit unchanged
+
+===============================================================
+
 Tag name: cam6_3_134
 Originator(s): nusbaume, jimmielin
 Date: 31 Oct 2023

src/physics/.clubb_sparse_checkout

@@ -0,0 +1,2 @@
+src/CLUBB_core
+src/SILHS

src/physics/cosp2/.cosp_sparse_checkout

@@ -0,0 +1 @@
+/src/

src/physics/cosp2/Makefile.in

@@ -65,10 +65,10 @@ cosp_grLidar532_interface.o: cosp_kinds.o
 cosp_atlid_interface.o     : cosp_kinds.o
 cosp_cloudsat_interface.o  : cosp_kinds.o cosp_config.o quickbeam.o
 cosp_isccp_interface.o     : cosp_kinds.o icarus.o
-cosp_misr_interface.o      : cosp_kinds.o 
+cosp_misr_interface.o      : cosp_kinds.o
 cosp_modis_interface.o     : cosp_kinds.o cosp_config.o modis_simulator.o
 cosp_rttov_interfaceSTUB.o : cosp_kinds.o cosp_config.o cosp_rttovSTUB.o
-cosp_parasol_interface.o   : cosp_kinds.o 
+cosp_parasol_interface.o   : cosp_kinds.o
 cosp_rttovSTUB.o           : cosp_kinds.o cosp_config.o cosp_constants.o
 MISR_simulator.o           : cosp_kinds.o cosp_config.o cosp_stats.o
 modis_simulator.o          : cosp_kinds.o cosp_config.o cosp_stats.o
@@ -82,7 +82,7 @@ scops.o               : cosp_kinds.o mo_rng.o cosp_errorHandling.o
 prec_scops.o	      : cosp_kinds.o cosp_config.o
 cosp_optics.o         : cosp_kinds.o cosp_constants.o modis_simulator.o
 quickbeam_optics.o    : cosp_kinds.o cosp_config.o cosp_constants.o quickbeam.o      \
-			            cosp_errorHandling.o array_lib.o math_lib.o optics_lib.o 
+			            cosp_errorHandling.o array_lib.o math_lib.o optics_lib.o
 optics_lib.o	      : cosp_kinds.o cosp_errorHandling.o
 array_lib.o   	      : cosp_kinds.o cosp_errorHandling.o
 math_lib.o            : cosp_kinds.o array_lib.o mrgrnk.o
@@ -107,37 +107,37 @@ quickbeam.o: $(RS_PATH)/quickbeam.F90
 MISR_simulator.o : $(MISR_PATH)/MISR_simulator.F90
 	$(F90) $(F90FLAGS) -c $<
 
-modis_simulator.o : $(MODIS_PATH)/modis_simulator.F90 
+modis_simulator.o : $(MODIS_PATH)/modis_simulator.F90
 	$(F90) $(F90FLAGS) -c $<
 
-cosp_rttov_interfaceSTUB.o : $(COSP_PATH)/src/simulator/cosp_rttov_interfaceSTUB.F90
+cosp_rttov_interfaceSTUB.o : $(COSP_PATH)/src/src/simulator/cosp_rttov_interfaceSTUB.F90
 	$(F90) $(F90FLAGS) -c $<
 
-cosp_misr_interface.o : $(COSP_PATH)/src/simulator/cosp_misr_interface.F90
+cosp_misr_interface.o : $(COSP_PATH)/src/src/simulator/cosp_misr_interface.F90
 	$(F90) $(F90FLAGS) -c $<
 
-cosp_modis_interface.o : $(COSP_PATH)/src/simulator/cosp_modis_interface.F90
+cosp_modis_interface.o : $(COSP_PATH)/src/src/simulator/cosp_modis_interface.F90
 	$(F90) $(F90FLAGS) -c $<
 
-cosp_isccp_interface.o : $(COSP_PATH)/src/simulator/cosp_isccp_interface.F90
+cosp_isccp_interface.o : $(COSP_PATH)/src/src/simulator/cosp_isccp_interface.F90
 	$(F90) $(F90FLAGS) -c $<
 
-cosp_calipso_interface.o : $(COSP_PATH)/src/simulator/cosp_calipso_interface.F90
+cosp_calipso_interface.o : $(COSP_PATH)/src/src/simulator/cosp_calipso_interface.F90
 	$(F90) $(F90FLAGS) -c $<
 
-cosp_grLidar532_interface.o : $(COSP_PATH)/src/simulator/cosp_grLidar532_interface.F90
+cosp_grLidar532_interface.o : $(COSP_PATH)/src/src/simulator/cosp_grLidar532_interface.F90
 	$(F90) $(F90FLAGS) -c $<
 
-cosp_atlid_interface.o : $(COSP_PATH)/src/simulator/cosp_atlid_interface.F90
+cosp_atlid_interface.o : $(COSP_PATH)/src/src/simulator/cosp_atlid_interface.F90
 	$(F90) $(F90FLAGS) -c $<
 
-cosp_cloudsat_interface.o : $(COSP_PATH)/src/simulator/cosp_cloudsat_interface.F90
+cosp_cloudsat_interface.o : $(COSP_PATH)/src/src/simulator/cosp_cloudsat_interface.F90
 	$(F90) $(F90FLAGS) -c $<
 
-cosp_parasol_interface.o : $(COSP_PATH)/src/simulator/cosp_parasol_interface.F90
+cosp_parasol_interface.o : $(COSP_PATH)/src/src/simulator/cosp_parasol_interface.F90
 	$(F90) $(F90FLAGS) -c $<
 
-cosp_rttovSTUB.o : $(RT_PATH)/cosp_rttovSTUB.F90 
+cosp_rttovSTUB.o : $(RT_PATH)/cosp_rttovSTUB.F90
 	$(F90) $(F90FLAGS) -c $<
 
 lidar_simulator.o : $(CS_PATH)/lidar_simulator.F90
@@ -146,19 +146,19 @@ lidar_simulator.o : $(CS_PATH)/lidar_simulator.F90
 parasol.o : $(PARASOL_PATH)/parasol.F90
 	$(F90) $(F90FLAGS) -c $<
 
-cosp_constants.o :  $(COSP_PATH)/src/cosp_constants.F90
+cosp_constants.o :  $(COSP_PATH)/src/src/cosp_constants.F90
 	$(F90) $(F90FLAGS) -c $<
 
 cosp_kinds.o : $(COSP_PATH)/cosp_kinds.F90
 	$(F90) $(F90FLAGS) -c $<
 
-cosp_config.o :  $(COSP_PATH)/src/cosp_config.F90
+cosp_config.o :  $(COSP_PATH)/src/src/cosp_config.F90
 	$(F90) $(F90FLAGS) -c $<
 
-cosp.o :  $(COSP_PATH)/src/cosp.F90
+cosp.o :  $(COSP_PATH)/src/src/cosp.F90
 	$(F90) $(F90FLAGS) -c $<
 
-cosp_stats.o :  $(COSP_PATH)/src/cosp_stats.F90
+cosp_stats.o :  $(COSP_PATH)/src/src/cosp_stats.F90
 	$(F90) $(F90FLAGS) -c $<
 
 # COSPv1.4 interface