diff --git a/Externals_CAM.cfg b/Externals_CAM.cfg index 463f3541e7..795ca77b07 100644 --- a/Externals_CAM.cfg +++ b/Externals_CAM.cfg @@ -13,24 +13,19 @@ local_path = src/physics/carma/base required = True [cosp2] -protocol = svn -tag = v2.1.4cesm/src -repo_url = https://github.com/CFMIP/COSPv2.0/tags/ +protocol = git +tag = v2.1.4cesm +repo_url = https://github.com/CFMIP/COSPv2.0 local_path = src/physics/cosp2/src +sparse = ../.cosp_sparse_checkout required = True [clubb] -protocol = svn -tag = clubb_4ncar_20221129_59cb19f_20230330_branchtag/src/CLUBB_core -repo_url = https://github.com/larson-group/clubb_release/tags/ +protocol = git +tag = clubb_4ncar_20221129_59cb19f_20230330_branchtag +repo_url = https://github.com/larson-group/clubb_release local_path = src/physics/clubb -required = True - -[silhs] -protocol = svn -tag = clubb_4ncar_20221129_59cb19f_20230330_branchtag/src/SILHS -repo_url = https://github.com/larson-group/clubb_release/tags/ -local_path = src/physics/silhs +sparse = ../.clubb_sparse_checkout required = True [pumas] diff --git a/bld/configure b/bld/configure index 06446ef39b..aab6d47985 100755 --- a/bld/configure +++ b/bld/configure @@ -2194,11 +2194,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') { @@ -2294,14 +2294,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 # Copy the "template" makefile to the new makefile. diff --git a/src/physics/.clubb_sparse_checkout b/src/physics/.clubb_sparse_checkout new file mode 100644 index 0000000000..1299233a5e --- /dev/null +++ b/src/physics/.clubb_sparse_checkout @@ -0,0 +1,2 @@ +src/CLUBB_core +src/SILHS 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/