From cd4546e5726769698400b1820367d728d651c44a Mon Sep 17 00:00:00 2001 From: Jesse Nusbaumer Date: Fri, 17 Nov 2023 10:11:09 -0700 Subject: [PATCH 1/4] Replace COSP2 github-svn checkout with git sparse method. --- Externals_CAM.cfg | 5 +- bld/configure | 22 ++++----- doc/ChangeLog | 64 ++++++++++++++++++++++++- src/physics/cosp2/.cosp_sparse_checkout | 1 + src/physics/cosp2/Makefile.in | 36 +++++++------- 5 files changed, 96 insertions(+), 32 deletions(-) create mode 100644 src/physics/cosp2/.cosp_sparse_checkout diff --git a/Externals_CAM.cfg b/Externals_CAM.cfg index b591e97c2c..073ca3a660 100644 --- a/Externals_CAM.cfg +++ b/Externals_CAM.cfg @@ -21,9 +21,10 @@ required = True [cosp2] local_path = src/physics/cosp2/src -protocol = svn +protocol = git repo_url = https://github.com/CFMIP/COSPv2.0/tags/ -tag = v2.1.4cesm/src +sparse = ../.cosp_sparse_checkout +tag = v2.1.4cesm required = True [externals_description] diff --git a/bld/configure b/bld/configure index e00e6ae57a..65d45b4788 100755 --- a/bld/configure +++ b/bld/configure @@ -121,9 +121,9 @@ OPTIONS test_tracers, test_tracers2]. Default: none. -chem Build CAM with specified prognostic chemistry package - [ trop_mam3 | trop_mam4 | trop_mam7 | trop_mozart | trop_strat_mam4_vbs | trop_strat_mam4_vbsext | - waccm_ma | waccm_mad | waccm_mad_mam4 | waccm_ma_mam4 | - waccm_ma_sulfur | waccm_sc | waccm_sc_mam4 | waccm_tsmlt_mam4 | + [ trop_mam3 | trop_mam4 | trop_mam7 | trop_mozart | trop_strat_mam4_vbs | trop_strat_mam4_vbsext | + waccm_ma | waccm_mad | waccm_mad_mam4 | waccm_ma_mam4 | + waccm_ma_sulfur | waccm_sc | waccm_sc_mam4 | waccm_tsmlt_mam4 | terminator | none ]. Default: trop_mam4 for cam6 and trop_mam3 for cam5. -[no]clubb_sgs Switch on [off] CLUBB_SGS. Default: on for cam6, otherwise off. @@ -1929,7 +1929,7 @@ if ($cfg_ref->get('analytic_ic')) { #WACCM-X extended thermosphere/ionosphere model if ($waccmx) { - $cfg_cppdefs .= ' -DWACCMX_PHYS'; + $cfg_cppdefs .= ' -DWACCMX_PHYS'; if (($dyn_pkg ne 'fv') and ($ionos ne 'none')) { die "ERROR: Ionosphere is only available for FV dycore \n"; } @@ -3075,13 +3075,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 diff --git a/doc/ChangeLog b/doc/ChangeLog index 228bab6585..322d583369 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,8 +1,70 @@ =============================================================== +Tag name: cam_cesm2_1_rel_59 +Originator(s): nusbaume +Date: 17 Nov 2023 +One-line Summary: removes svn sparse checkout +Github PR URL: https://github.com/ESCOMP/CAM/pull/XXX + +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: cacraigucar + +List all files eliminated: N/A + +List all files added and what they do: + +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 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: + +cheyenne/intel/aux_cam: + +izumi/nag: + +izumi/pgi: + +Summarize any changes to answers: + +=============================================================== + Tag name: cam_cesm2_1_rel_r58 Originator(s): fischer -Date: 30 May 2023 +Date: 30 May 2023 One-line Summary: Add use case for BSSP585smbb Github PR URL: https://github.com/ESCOMP/CAM/pull/822 diff --git a/src/physics/cosp2/.cosp_sparse_checkout b/src/physics/cosp2/.cosp_sparse_checkout new file mode 100644 index 0000000000..4f00cd9a73 --- /dev/null +++ b/src/physics/cosp2/.cosp_sparse_checkout @@ -0,0 +1 @@ +/src/ 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 01c4c2b3e9b718484642d4345eff3c66d5da2fcc Mon Sep 17 00:00:00 2001 From: Jesse Nusbaumer Date: Fri, 17 Nov 2023 10:16:21 -0700 Subject: [PATCH 2/4] Fix COSP Github URL. --- Externals_CAM.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals_CAM.cfg b/Externals_CAM.cfg index 073ca3a660..d8baa8d901 100644 --- a/Externals_CAM.cfg +++ b/Externals_CAM.cfg @@ -22,7 +22,7 @@ required = True [cosp2] local_path = src/physics/cosp2/src protocol = git -repo_url = https://github.com/CFMIP/COSPv2.0/tags/ +repo_url = https://github.com/CFMIP/COSPv2.0 sparse = ../.cosp_sparse_checkout tag = v2.1.4cesm required = True From d3cd749dca288b9b01a5b631106f36446ee39067 Mon Sep 17 00:00:00 2001 From: Jesse Nusbaumer Date: Mon, 27 Nov 2023 09:15:43 -0700 Subject: [PATCH 3/4] Add qsub flag needed for older test system to run correctly on Cheyenne. --- test/system/test_driver.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/system/test_driver.sh b/test/system/test_driver.sh index 3feef77558..e309e3cbef 100755 --- a/test/system/test_driver.sh +++ b/test/system/test_driver.sh @@ -937,7 +937,7 @@ if [ -n "${submit_script_cb}" ]; then case $hostname in # cheyenne chey* | r* ) - batch_queue_submit='qsub ' + batch_queue_submit='qsub -V' ;; *) echo "ERROR: machine $hostname not currently supported for batch builds" @@ -1082,7 +1082,7 @@ if [ "${cesm_test_suite}" != "none" -a -n "${cesm_test_mach}" ]; then echo "cd ${script_dir}" >> ${submit_script_cime} echo './create_test' ${testargs} >> ${submit_script_cime} chmod u+x ${submit_script_cime} - qsub ${submit_script_cime} + qsub -V ${submit_script_cime} fi if [ "${hostname:0:6}" == "hobart" ]; then @@ -1116,7 +1116,7 @@ if $run_cam_regression; then case $hostname in ##cheyenne ch* | r* ) - qsub ${submit_script_cb} + qsub -V ${submit_script_cb} ;; ##hobart From 70623c8e74c02f66f7594fdedf721dbbce6c96a6 Mon Sep 17 00:00:00 2001 From: Jesse Nusbaumer Date: Mon, 27 Nov 2023 09:49:59 -0700 Subject: [PATCH 4/4] Finalize ChangeLog. --- doc/ChangeLog | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 322d583369..982433ed70 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -2,9 +2,9 @@ Tag name: cam_cesm2_1_rel_59 Originator(s): nusbaume -Date: 17 Nov 2023 +Date: 27 Nov 2023 One-line Summary: removes svn sparse checkout -Github PR URL: https://github.com/ESCOMP/CAM/pull/XXX +Github PR URL: https://github.com/ESCOMP/CAM/pull/916 Purpose of changes (include the issue number and title text for each relevant GitHub issue): @@ -45,20 +45,23 @@ M bld/configure M src/physics/cosp2/Makefile.in - Update source code paths for relevant COSP files. +M test/system/test_driver.sh + - Add qsub flag needed for old test system to run on Cheyenne. + 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: +cheyenne/intel: bit-for-bit -cheyenne/intel/aux_cam: +cheyenne/intel/aux_cam: bit-for-bit -izumi/nag: +izumi/nag: bit-for-bit -izumi/pgi: +izumi/pgi: SKIPPED - NO LONGER SUPPORTED -Summarize any changes to answers: +Summarize any changes to answers: ALL SUPPORTED TESTS PASS ===============================================================