From 5a2f611acb6020ebcc3a048421a09804c95c27b7 Mon Sep 17 00:00:00 2001 From: Jesse Nusbaumer Date: Tue, 14 Nov 2023 08:59:48 -0700 Subject: [PATCH 1/2] 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 2/2] 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