From 8a07c9e37cb5028b08cf0c66d6505e9c60b691c0 Mon Sep 17 00:00:00 2001 From: James Edwards Date: Tue, 14 Nov 2023 06:46:14 -0700 Subject: [PATCH 1/6] removes svn sparse checkout and uses git sparse checkout for all repos, combine clubb and silhs into clubb --- Externals_CAM.cfg | 21 ++++++++------------- bld/configure | 4 ++-- src/physics/.clubb_sparse_checkout | 2 ++ src/physics/cosp2/.cosp_sparse_checkout | 1 + 4 files changed, 13 insertions(+), 15 deletions(-) create mode 100644 src/physics/.clubb_sparse_checkout create mode 100644 src/physics/cosp2/.cosp_sparse_checkout diff --git a/Externals_CAM.cfg b/Externals_CAM.cfg index f58df387ea..5e6527b5bd 100644 --- a/Externals_CAM.cfg +++ b/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] diff --git a/bld/configure b/bld/configure index d1f86cb03e..7a7450b75f 100755 --- a/bld/configure +++ b/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') { diff --git a/src/physics/.clubb_sparse_checkout b/src/physics/.clubb_sparse_checkout new file mode 100644 index 0000000000..9cb681b77a --- /dev/null +++ b/src/physics/.clubb_sparse_checkout @@ -0,0 +1,2 @@ +src/CLUBB_core +src/SILHS \ No newline at end of file diff --git a/src/physics/cosp2/.cosp_sparse_checkout b/src/physics/cosp2/.cosp_sparse_checkout new file mode 100644 index 0000000000..e8310385c5 --- /dev/null +++ b/src/physics/cosp2/.cosp_sparse_checkout @@ -0,0 +1 @@ +src \ No newline at end of file From 401b3383103ed81dbbfbd4dbca836387d065a7cf Mon Sep 17 00:00:00 2001 From: James Edwards Date: Tue, 14 Nov 2023 06:51:52 -0700 Subject: [PATCH 2/6] add final carrage returns --- src/physics/.clubb_sparse_checkout | 2 +- src/physics/cosp2/.cosp_sparse_checkout | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/physics/.clubb_sparse_checkout b/src/physics/.clubb_sparse_checkout index 9cb681b77a..1299233a5e 100644 --- a/src/physics/.clubb_sparse_checkout +++ b/src/physics/.clubb_sparse_checkout @@ -1,2 +1,2 @@ src/CLUBB_core -src/SILHS \ No newline at end of file +src/SILHS diff --git a/src/physics/cosp2/.cosp_sparse_checkout b/src/physics/cosp2/.cosp_sparse_checkout index e8310385c5..85de9cf933 100644 --- a/src/physics/cosp2/.cosp_sparse_checkout +++ b/src/physics/cosp2/.cosp_sparse_checkout @@ -1 +1 @@ -src \ No newline at end of file +src From 5a2f611acb6020ebcc3a048421a09804c95c27b7 Mon Sep 17 00:00:00 2001 From: Jesse Nusbaumer Date: Tue, 14 Nov 2023 08:59:48 -0700 Subject: [PATCH 3/6] Modify COSP2 checkout to remove un-used directories/files. --- Externals_CAM.cfg | 2 +- src/physics/cosp2/.cosp_sparse_checkout | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Externals_CAM.cfg b/Externals_CAM.cfg index 5e6527b5bd..2881ce0093 100644 --- a/Externals_CAM.cfg +++ b/Externals_CAM.cfg @@ -13,7 +13,7 @@ tag = carma4_01 required = True [cosp2] -local_path = src/physics/cosp2/src +local_path = src/physics/cosp2 protocol = git repo_url = https://github.com/CFMIP/COSPv2.0 sparse = ../.cosp_sparse_checkout diff --git a/src/physics/cosp2/.cosp_sparse_checkout b/src/physics/cosp2/.cosp_sparse_checkout index 85de9cf933..4f00cd9a73 100644 --- a/src/physics/cosp2/.cosp_sparse_checkout +++ b/src/physics/cosp2/.cosp_sparse_checkout @@ -1 +1 @@ -src +/src/ From e8707d5a3bd96c7c0ad32c9adf8518313ef02bf7 Mon Sep 17 00:00:00 2001 From: Jesse Nusbaumer Date: Tue, 14 Nov 2023 09:31:52 -0700 Subject: [PATCH 4/6] Fix paths, including a mistake introduced on my end. --- Externals_CAM.cfg | 2 +- bld/configure | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Externals_CAM.cfg b/Externals_CAM.cfg index 2881ce0093..5e6527b5bd 100644 --- a/Externals_CAM.cfg +++ b/Externals_CAM.cfg @@ -13,7 +13,7 @@ tag = carma4_01 required = True [cosp2] -local_path = src/physics/cosp2 +local_path = src/physics/cosp2/src protocol = git repo_url = https://github.com/CFMIP/COSPv2.0 sparse = ../.cosp_sparse_checkout diff --git a/bld/configure b/bld/configure index 7a7450b75f..3fa950eef9 100755 --- a/bld/configure +++ b/bld/configure @@ -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 From 07359951bcf09a31bdb796dbd88fbad9ab5a7332 Mon Sep 17 00:00:00 2001 From: Jesse Nusbaumer Date: Thu, 16 Nov 2023 11:26:43 -0700 Subject: [PATCH 5/6] Fix COSP Makefile paths. --- src/physics/cosp2/Makefile.in | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/physics/cosp2/Makefile.in b/src/physics/cosp2/Makefile.in index 69a37713fa..881a1a5679 100644 --- a/src/physics/cosp2/Makefile.in +++ b/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 From 5888903ea6158488314b8789236637e761e93290 Mon Sep 17 00:00:00 2001 From: Jesse Nusbaumer Date: Thu, 16 Nov 2023 15:30:44 -0700 Subject: [PATCH 6/6] Update ChangeLog. --- doc/ChangeLog | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index 7e45ac811b..9436ef69ab 100644 --- a/doc/ChangeLog +++ b/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