From 8804304db056c8e9a171cb4e6586c669ec591537 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Fri, 28 Feb 2025 11:53:32 +1100 Subject: [PATCH 01/14] Initial script for shuffle DO NOT MERGE --- shuffle.sh | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 shuffle.sh diff --git a/shuffle.sh b/shuffle.sh new file mode 100644 index 000000000..d9aaff583 --- /dev/null +++ b/shuffle.sh @@ -0,0 +1,91 @@ +#!/bin/bash + +# Set configuration +WORK_DIR="~/work/library_shuffle" + +CABLE_REPO="git@github.com:CABLE-LSM/CABLE.git" +CABLE_BRANCH="538-the-great-library-shuffle" +CABLE_DIR="{WORK_DIR}/cable" +CABLE_SHARED_DIR=$CABLE_DIR/src/shared +CABLE_ESM15_DIR=$CABLE_DIR/src/coupled/ESM1.5 +CABLE_ESM16_DIR=$CABLE_DIR/src/coupled/esm16 +CABLE_ESM_DIR=$CABLE_DIR/src/coupled/esm + +UM7_REPO="git@github.com:ACCESS-NRI/UM7.git" +UM7_BRANCH="64-the-great-library-shuffle" +UM7_DIR="{WORK_DIR}/um7" +UM7_ESM15_DIR=$UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/coupled/ESM1.5 +UM7_CABLE_DIR=$UM7_DIR/umbase_hg3/src/atmosphere/land_surface/cable + +# Delete and remake work dir +rm -rf $WORK_DIR +mkdir -p $WORK_DIR + +# Clone everything +cd $WORK_DIR +git clone $CABLE_REPO $CABLE_DIR +git clone $UM7_REPO $UM7_DIR + +# Check out the CABLE branch for the shuffle +cd $CABLE_DIR +git fetch origin +git checkout $CABLE_BRANCH + +# Check out specific branches +cd $UM7_DIR +git fetch origin +git checkout $UM7_BRANCH + +# Create a src/shared dir in CABLE +mkdir -p $CABLE_SHARED_DIR + +# Move from offline to shared +mv $CABLE_DIR/src/offline/cable_LUC_EXPT.F90 $CABLE_SHARED_DIR/ +mv $CABLE_DIR/src/offline/cable_phenology.F90 $CABLE_SHARED_DIR/ +mv $CABLE_DIR/src/offline/casa_ncdf.F90 $CABLE_SHARED_DIR/ +mv $CABLE_DIR/src/offline/casa_offline_inout.F90 $CABLE_SHARED_DIR/ + +# Remove them from offline (done in move above) + +# Remove from ESM1.5 (none) + +# Remove from esm16 +rm -rf $CABLE_ESM16_DIR/cable_LUC_EXPT.F90 +rm -rf $CABLE_ESM16_DIR/cable_phenology.F90 +rm -rf $CABLE_ESM16_DIR/casa_ncdf.F90 +rm -rf $CABLE_ESM16_DIR/casa_offline_inout.F90 + +# Add shared to CMakeLists.txt (manual) + +# Create the land_surface/cable dir +mkdir -p $UM7_CABLE_DIR + +# Move source into it (not sure if we need to delete the src location?) +cp $UM7_ESM15_DIR/casa_types.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_DIR/pack_mod_cbl.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_DIR/cable_rad_driver.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_DIR/cable_um_init.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_DIR/cable_um_init_subrs.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_DIR/cable_um_tech.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_DIR/allocate_soil_params_cbl.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_DIR/allocate_veg_params_cbl.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_DIR/cable_cbm.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_DIR/cable_explicit_driver.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_DIR/cable_hyd_driver.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_DIR/cable_implicit_driver.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_DIR/cbl_um_init_soil.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_DIR/cbl_um_init_soilsnow.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_DIR/cbl_um_update_soilsnow.F90 $UM7_CABLE_DIR/ + +# casa_um_inout.F90 (currently in esm16/ but it needs to be deleted from there) +# it is not there? + +# Put in $CABLE_DIR/src/coupled/esm/, copied from $UM7_DIR/src/atmosphere/CABLE/src/coupled/ESM1.5/ +cp $UM7_ESM15_DIR/cable_pft_params.F90 $CABLE_ESM_DIR/ +cp $UM7_ESM15_DIR/cable_soil_params.F90 $CABLE_ESM_DIR/ +cp $UM7_ESM15_DIR/cable_surface_tyoes.F90 $CABLE_ESM_DIR/ +cp $UM7_ESM15_DIR/cable_landuse.F90 $CABLE_ESM_DIR/ +cp $UM7_ESM15_DIR/cable_define_types.F90 $CABLE_ESM_DIR/ +cp $UM7_ESM15_DIR/cable_iovars.F90 $CABLE_ESM_DIR/ + +# Perform the git commit/push manually once we verify this is all moved correctly. \ No newline at end of file From 387074a9c8de4434e047fb061a72b9189b90b19e Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Fri, 28 Feb 2025 11:53:32 +1100 Subject: [PATCH 02/14] Update shuffle.sh Co-authored-by: Claire Carouge --- shuffle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shuffle.sh b/shuffle.sh index d9aaff583..66a21afb6 100644 --- a/shuffle.sh +++ b/shuffle.sh @@ -83,7 +83,7 @@ cp $UM7_ESM15_DIR/cbl_um_update_soilsnow.F90 $UM7_CABLE_DIR/ # Put in $CABLE_DIR/src/coupled/esm/, copied from $UM7_DIR/src/atmosphere/CABLE/src/coupled/ESM1.5/ cp $UM7_ESM15_DIR/cable_pft_params.F90 $CABLE_ESM_DIR/ cp $UM7_ESM15_DIR/cable_soil_params.F90 $CABLE_ESM_DIR/ -cp $UM7_ESM15_DIR/cable_surface_tyoes.F90 $CABLE_ESM_DIR/ +cp $UM7_ESM15_DIR/cable_surface_types.F90 $CABLE_ESM_DIR/ cp $UM7_ESM15_DIR/cable_landuse.F90 $CABLE_ESM_DIR/ cp $UM7_ESM15_DIR/cable_define_types.F90 $CABLE_ESM_DIR/ cp $UM7_ESM15_DIR/cable_iovars.F90 $CABLE_ESM_DIR/ From 57a36b492c1075d5b747d7839b6f514f460b990c Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Fri, 28 Feb 2025 11:53:32 +1100 Subject: [PATCH 03/14] Update shuffle.sh Co-authored-by: Claire Carouge --- shuffle.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/shuffle.sh b/shuffle.sh index 66a21afb6..4f61740c6 100644 --- a/shuffle.sh +++ b/shuffle.sh @@ -76,6 +76,7 @@ cp $UM7_ESM15_DIR/cable_implicit_driver.F90 $UM7_CABLE_DIR/ cp $UM7_ESM15_DIR/cbl_um_init_soil.F90 $UM7_CABLE_DIR/ cp $UM7_ESM15_DIR/cbl_um_init_soilsnow.F90 $UM7_CABLE_DIR/ cp $UM7_ESM15_DIR/cbl_um_update_soilsnow.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_DIR/cable_read_nml.F90 $UM7_CABLE_DIR/ # casa_um_inout.F90 (currently in esm16/ but it needs to be deleted from there) # it is not there? From 4816d303cbcbdcc9252bcdd1b1ea52ac97242894 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Fri, 28 Feb 2025 11:53:32 +1100 Subject: [PATCH 04/14] Update shuffle.sh Co-authored-by: Claire Carouge --- shuffle.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/shuffle.sh b/shuffle.sh index 4f61740c6..3676429fd 100644 --- a/shuffle.sh +++ b/shuffle.sh @@ -82,8 +82,6 @@ cp $UM7_ESM15_DIR/cable_read_nml.F90 $UM7_CABLE_DIR/ # it is not there? # Put in $CABLE_DIR/src/coupled/esm/, copied from $UM7_DIR/src/atmosphere/CABLE/src/coupled/ESM1.5/ -cp $UM7_ESM15_DIR/cable_pft_params.F90 $CABLE_ESM_DIR/ -cp $UM7_ESM15_DIR/cable_soil_params.F90 $CABLE_ESM_DIR/ cp $UM7_ESM15_DIR/cable_surface_types.F90 $CABLE_ESM_DIR/ cp $UM7_ESM15_DIR/cable_landuse.F90 $CABLE_ESM_DIR/ cp $UM7_ESM15_DIR/cable_define_types.F90 $CABLE_ESM_DIR/ From 097a710d109604d67c6e64444e330820ec3a1ef7 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Fri, 28 Feb 2025 11:53:32 +1100 Subject: [PATCH 05/14] Update shuffle.sh Co-authored-by: Claire Carouge --- shuffle.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shuffle.sh b/shuffle.sh index 3676429fd..da73c9751 100644 --- a/shuffle.sh +++ b/shuffle.sh @@ -44,6 +44,8 @@ mv $CABLE_DIR/src/offline/cable_LUC_EXPT.F90 $CABLE_SHARED_DIR/ mv $CABLE_DIR/src/offline/cable_phenology.F90 $CABLE_SHARED_DIR/ mv $CABLE_DIR/src/offline/casa_ncdf.F90 $CABLE_SHARED_DIR/ mv $CABLE_DIR/src/offline/casa_offline_inout.F90 $CABLE_SHARED_DIR/ +mv $CABLE_DIR/src/offline/cable_pft_params.F90 $CABLE_SHARED_DIR/cable_pft_params_mod.F90 +mv $CABLE_DIR/src/offline/cable_soil_params.F90 $CABLE_SHARED_DIR/cable_soil_params_mod.F90 # Remove them from offline (done in move above) From 456c26134db081804eb1c738aa3449aebbe1e9ff Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Fri, 28 Feb 2025 11:53:32 +1100 Subject: [PATCH 06/14] Update shuffle.sh Co-authored-by: Claire Carouge --- shuffle.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/shuffle.sh b/shuffle.sh index da73c9751..f54b4165e 100644 --- a/shuffle.sh +++ b/shuffle.sh @@ -44,8 +44,11 @@ mv $CABLE_DIR/src/offline/cable_LUC_EXPT.F90 $CABLE_SHARED_DIR/ mv $CABLE_DIR/src/offline/cable_phenology.F90 $CABLE_SHARED_DIR/ mv $CABLE_DIR/src/offline/casa_ncdf.F90 $CABLE_SHARED_DIR/ mv $CABLE_DIR/src/offline/casa_offline_inout.F90 $CABLE_SHARED_DIR/ -mv $CABLE_DIR/src/offline/cable_pft_params.F90 $CABLE_SHARED_DIR/cable_pft_params_mod.F90 -mv $CABLE_DIR/src/offline/cable_soil_params.F90 $CABLE_SHARED_DIR/cable_soil_params_mod.F90 +mv $UM7_ESM15_DIR/cable_pft_params_mod.F90 $CABLE_SHARED_DIR/ +mv $UM7_ESM15_DIR/cable_soil_params_mod.F90 $CABLE_SHARED_DIR/ + +rm $CABLE_DIR/src/offline/cable_pft_params.F90 +rm $CABLE_DIR/src/offline/cable_soil_params.F90 # Remove them from offline (done in move above) From a4f5234a3d5ca59cfd49765262f7ef8c4fc17c71 Mon Sep 17 00:00:00 2001 From: Ben Schroeter Date: Fri, 28 Feb 2025 11:53:32 +1100 Subject: [PATCH 07/14] Update shuffle.sh Co-authored-by: Claire Carouge --- shuffle.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/shuffle.sh b/shuffle.sh index f54b4165e..50caefe50 100644 --- a/shuffle.sh +++ b/shuffle.sh @@ -92,4 +92,18 @@ cp $UM7_ESM15_DIR/cable_landuse.F90 $CABLE_ESM_DIR/ cp $UM7_ESM15_DIR/cable_define_types.F90 $CABLE_ESM_DIR/ cp $UM7_ESM15_DIR/cable_iovars.F90 $CABLE_ESM_DIR/ +# Remove unnecessary directories +rm -r $CABLE_ESM16_DIR +rm -r $CABLE_ESM15_DIR +rm -r $CABLE_DIR/src/coupled/ACCESS-CM2 + +# Replace CABLE directory in UM7 with the one with the reorganised files +rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/ +cp -r $CABLE_DIR/src $UM7_DIR/umbase_hg3/src/atmosphere/ +rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/offline +rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/AM3 +rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/JAC + +# Uncomment the #define lines for the pre-processor flags in the science code manually. + # Perform the git commit/push manually once we verify this is all moved correctly. \ No newline at end of file From c1f66bc4a30827e344ed98310c8ddfc4bc1dd65f Mon Sep 17 00:00:00 2001 From: Claire Carouge Date: Fri, 28 Feb 2025 11:53:32 +1100 Subject: [PATCH 08/14] Debugging --- shuffle.sh | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) mode change 100644 => 100755 shuffle.sh diff --git a/shuffle.sh b/shuffle.sh old mode 100644 new mode 100755 index 50caefe50..e3f35f253 --- a/shuffle.sh +++ b/shuffle.sh @@ -1,11 +1,11 @@ #!/bin/bash # Set configuration -WORK_DIR="~/work/library_shuffle" +WORK_DIR="${HOME}/work/library_shuffle" CABLE_REPO="git@github.com:CABLE-LSM/CABLE.git" CABLE_BRANCH="538-the-great-library-shuffle" -CABLE_DIR="{WORK_DIR}/cable" +CABLE_DIR="${WORK_DIR}/cable" CABLE_SHARED_DIR=$CABLE_DIR/src/shared CABLE_ESM15_DIR=$CABLE_DIR/src/coupled/ESM1.5 CABLE_ESM16_DIR=$CABLE_DIR/src/coupled/esm16 @@ -13,7 +13,7 @@ CABLE_ESM_DIR=$CABLE_DIR/src/coupled/esm UM7_REPO="git@github.com:ACCESS-NRI/UM7.git" UM7_BRANCH="64-the-great-library-shuffle" -UM7_DIR="{WORK_DIR}/um7" +UM7_DIR="${WORK_DIR}/um7" UM7_ESM15_DIR=$UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/coupled/ESM1.5 UM7_CABLE_DIR=$UM7_DIR/umbase_hg3/src/atmosphere/land_surface/cable @@ -36,20 +36,31 @@ cd $UM7_DIR git fetch origin git checkout $UM7_BRANCH +echo "check content of UM7_ESM15_DIR" +ls $UM7_ESM15_DIR/ + # Create a src/shared dir in CABLE mkdir -p $CABLE_SHARED_DIR +ls $UM7_ESM15_DIR/cable_pft_params_mod.F90 # Move from offline to shared -mv $CABLE_DIR/src/offline/cable_LUC_EXPT.F90 $CABLE_SHARED_DIR/ -mv $CABLE_DIR/src/offline/cable_phenology.F90 $CABLE_SHARED_DIR/ -mv $CABLE_DIR/src/offline/casa_ncdf.F90 $CABLE_SHARED_DIR/ -mv $CABLE_DIR/src/offline/casa_offline_inout.F90 $CABLE_SHARED_DIR/ -mv $UM7_ESM15_DIR/cable_pft_params_mod.F90 $CABLE_SHARED_DIR/ -mv $UM7_ESM15_DIR/cable_soil_params_mod.F90 $CABLE_SHARED_DIR/ - -rm $CABLE_DIR/src/offline/cable_pft_params.F90 -rm $CABLE_DIR/src/offline/cable_soil_params.F90 - +mv -v $CABLE_DIR/src/offline/cable_LUC_EXPT.F90 $CABLE_SHARED_DIR/ +ls $UM7_ESM15_DIR/cable_pft_params_mod.F90 +mv -v $CABLE_DIR/src/offline/cable_phenology.F90 $CABLE_SHARED_DIR/ +ls $UM7_ESM15_DIR/cable_pft_params_mod.F90 +mv -v $CABLE_DIR/src/offline/casa_ncdf.F90 $CABLE_SHARED_DIR/ +ls $UM7_ESM15_DIR/cable_pft_params_mod.F90 +mv -v $CABLE_DIR/src/offline/casa_offline_inout.F90 $CABLE_SHARED_DIR/ +ls $UM7_ESM15_DIR/cable_pft_params_mod.F90 +mv -v $UM7_ESM15_DIR/cable_pft_params_mod.F90 $CABLE_SHARED_DIR/ +ls $UM7_ESM15_DIR/cable_pft_params_mod.F90 +mv -v $UM7_ESM15_DIR/cable_soil_params_mod.F90 $CABLE_SHARED_DIR/ +ls $UM7_ESM15_DIR/cable_pft_params_mod.F90 + +echo rm $CABLE_DIR/src/offline/cable_pft_params.F90 +echo rm $CABLE_DIR/src/offline/cable_soil_params.F90 + +exit # Remove them from offline (done in move above) # Remove from ESM1.5 (none) From 91db838ad7dbb5e65e1c4a338893376a9128270a Mon Sep 17 00:00:00 2001 From: Claire Carouge Date: Fri, 28 Feb 2025 14:54:42 +1100 Subject: [PATCH 09/14] More changes to get it right --- shuffle.sh | 63 +++++++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 29 deletions(-) diff --git a/shuffle.sh b/shuffle.sh index e3f35f253..e4dc3e382 100755 --- a/shuffle.sh +++ b/shuffle.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -e + # Set configuration WORK_DIR="${HOME}/work/library_shuffle" @@ -15,6 +17,7 @@ UM7_REPO="git@github.com:ACCESS-NRI/UM7.git" UM7_BRANCH="64-the-great-library-shuffle" UM7_DIR="${WORK_DIR}/um7" UM7_ESM15_DIR=$UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/coupled/ESM1.5 +UM7_ESM15_SUBDIR=$UM7_ESM15_DIR/CABLEfilesFromESM1.5 UM7_CABLE_DIR=$UM7_DIR/umbase_hg3/src/atmosphere/land_surface/cable # Delete and remake work dir @@ -41,26 +44,18 @@ ls $UM7_ESM15_DIR/ # Create a src/shared dir in CABLE mkdir -p $CABLE_SHARED_DIR -ls $UM7_ESM15_DIR/cable_pft_params_mod.F90 # Move from offline to shared mv -v $CABLE_DIR/src/offline/cable_LUC_EXPT.F90 $CABLE_SHARED_DIR/ -ls $UM7_ESM15_DIR/cable_pft_params_mod.F90 mv -v $CABLE_DIR/src/offline/cable_phenology.F90 $CABLE_SHARED_DIR/ -ls $UM7_ESM15_DIR/cable_pft_params_mod.F90 mv -v $CABLE_DIR/src/offline/casa_ncdf.F90 $CABLE_SHARED_DIR/ -ls $UM7_ESM15_DIR/cable_pft_params_mod.F90 mv -v $CABLE_DIR/src/offline/casa_offline_inout.F90 $CABLE_SHARED_DIR/ -ls $UM7_ESM15_DIR/cable_pft_params_mod.F90 mv -v $UM7_ESM15_DIR/cable_pft_params_mod.F90 $CABLE_SHARED_DIR/ -ls $UM7_ESM15_DIR/cable_pft_params_mod.F90 mv -v $UM7_ESM15_DIR/cable_soil_params_mod.F90 $CABLE_SHARED_DIR/ -ls $UM7_ESM15_DIR/cable_pft_params_mod.F90 echo rm $CABLE_DIR/src/offline/cable_pft_params.F90 echo rm $CABLE_DIR/src/offline/cable_soil_params.F90 -exit # Remove them from offline (done in move above) # Remove from ESM1.5 (none) @@ -79,41 +74,51 @@ mkdir -p $UM7_CABLE_DIR # Move source into it (not sure if we need to delete the src location?) cp $UM7_ESM15_DIR/casa_types.F90 $UM7_CABLE_DIR/ cp $UM7_ESM15_DIR/pack_mod_cbl.F90 $UM7_CABLE_DIR/ -cp $UM7_ESM15_DIR/cable_rad_driver.F90 $UM7_CABLE_DIR/ -cp $UM7_ESM15_DIR/cable_um_init.F90 $UM7_CABLE_DIR/ -cp $UM7_ESM15_DIR/cable_um_init_subrs.F90 $UM7_CABLE_DIR/ -cp $UM7_ESM15_DIR/cable_um_tech.F90 $UM7_CABLE_DIR/ -cp $UM7_ESM15_DIR/allocate_soil_params_cbl.F90 $UM7_CABLE_DIR/ -cp $UM7_ESM15_DIR/allocate_veg_params_cbl.F90 $UM7_CABLE_DIR/ -cp $UM7_ESM15_DIR/cable_cbm.F90 $UM7_CABLE_DIR/ -cp $UM7_ESM15_DIR/cable_explicit_driver.F90 $UM7_CABLE_DIR/ -cp $UM7_ESM15_DIR/cable_hyd_driver.F90 $UM7_CABLE_DIR/ -cp $UM7_ESM15_DIR/cable_implicit_driver.F90 $UM7_CABLE_DIR/ -cp $UM7_ESM15_DIR/cbl_um_init_soil.F90 $UM7_CABLE_DIR/ -cp $UM7_ESM15_DIR/cbl_um_init_soilsnow.F90 $UM7_CABLE_DIR/ -cp $UM7_ESM15_DIR/cbl_um_update_soilsnow.F90 $UM7_CABLE_DIR/ -cp $UM7_ESM15_DIR/cable_read_nml.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_SUBDIR/cable_rad_driver.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_SUBDIR/cable_um_init.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_SUBDIR/cable_um_init_subrs.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_SUBDIR/cable_um_tech.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_SUBDIR/allocate_soil_params_cbl.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_SUBDIR/allocate_veg_params_cbl.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_SUBDIR/cable_cbm.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_SUBDIR/cable_explicit_driver.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_SUBDIR/cable_hyd_driver.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_SUBDIR/cable_implicit_driver.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_SUBDIR/cbl_um_init_soil.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_SUBDIR/cbl_um_init_soilsnow.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_SUBDIR/cbl_um_update_soilsnow.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_SUBDIR/cable_read_nml.F90 $UM7_CABLE_DIR/ # casa_um_inout.F90 (currently in esm16/ but it needs to be deleted from there) # it is not there? # Put in $CABLE_DIR/src/coupled/esm/, copied from $UM7_DIR/src/atmosphere/CABLE/src/coupled/ESM1.5/ +mkdir -p $CABLE_ESM_DIR cp $UM7_ESM15_DIR/cable_surface_types.F90 $CABLE_ESM_DIR/ -cp $UM7_ESM15_DIR/cable_landuse.F90 $CABLE_ESM_DIR/ -cp $UM7_ESM15_DIR/cable_define_types.F90 $CABLE_ESM_DIR/ -cp $UM7_ESM15_DIR/cable_iovars.F90 $CABLE_ESM_DIR/ +cp $UM7_ESM15_DIR/casa_landuse.F90 $CABLE_ESM_DIR/ +cp $UM7_ESM15_SUBDIR/cable_define_types.F90 $CABLE_ESM_DIR/ +cp $UM7_ESM15_SUBDIR/cable_iovars.F90 $CABLE_ESM_DIR/ # Remove unnecessary directories rm -r $CABLE_ESM16_DIR rm -r $CABLE_ESM15_DIR rm -r $CABLE_DIR/src/coupled/ACCESS-CM2 -# Replace CABLE directory in UM7 with the one with the reorganised files +# Replace CABLE directory in UM7 with the one with the reorganised files. We can't do a clean sweep as the sync between the repos isn't complete. +mv -v $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/science $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/ +mv -v $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/util $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/ +mv -v $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/params $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/ rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/ -cp -r $CABLE_DIR/src $UM7_DIR/umbase_hg3/src/atmosphere/ +cp -r $CABLE_DIR/src $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/ rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/offline -rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/AM3 -rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/JAC +rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/coupled/AM3 +rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/coupled/JAC +rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/params +rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/science +rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/util +mv -v $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/params $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/ +mv -v $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/science $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/ +mv -v $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/util $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/ # Uncomment the #define lines for the pre-processor flags in the science code manually. From be3bd4f549b9dba0be85943e37d63f0cc1ea672c Mon Sep 17 00:00:00 2001 From: Claire Carouge Date: Fri, 28 Feb 2025 15:12:11 +1100 Subject: [PATCH 10/14] One more change --- shuffle.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shuffle.sh b/shuffle.sh index e4dc3e382..b43120937 100755 --- a/shuffle.sh +++ b/shuffle.sh @@ -50,8 +50,6 @@ mv -v $CABLE_DIR/src/offline/cable_LUC_EXPT.F90 $CABLE_SHARED_DIR/ mv -v $CABLE_DIR/src/offline/cable_phenology.F90 $CABLE_SHARED_DIR/ mv -v $CABLE_DIR/src/offline/casa_ncdf.F90 $CABLE_SHARED_DIR/ mv -v $CABLE_DIR/src/offline/casa_offline_inout.F90 $CABLE_SHARED_DIR/ -mv -v $UM7_ESM15_DIR/cable_pft_params_mod.F90 $CABLE_SHARED_DIR/ -mv -v $UM7_ESM15_DIR/cable_soil_params_mod.F90 $CABLE_SHARED_DIR/ echo rm $CABLE_DIR/src/offline/cable_pft_params.F90 echo rm $CABLE_DIR/src/offline/cable_soil_params.F90 @@ -98,6 +96,8 @@ cp $UM7_ESM15_DIR/cable_surface_types.F90 $CABLE_ESM_DIR/ cp $UM7_ESM15_DIR/casa_landuse.F90 $CABLE_ESM_DIR/ cp $UM7_ESM15_SUBDIR/cable_define_types.F90 $CABLE_ESM_DIR/ cp $UM7_ESM15_SUBDIR/cable_iovars.F90 $CABLE_ESM_DIR/ +cp $UM7_ESM15_DIR/cable_pft_params_mod.F90 $CABLE_SHARED_DIR/ +cp $UM7_ESM15_DIR/cable_soil_params_mod.F90 $CABLE_SHARED_DIR/ # Remove unnecessary directories rm -r $CABLE_ESM16_DIR From 7fcf0cefd75440d14fb40c14938fb722017bcfe7 Mon Sep 17 00:00:00 2001 From: Claire Carouge Date: Fri, 28 Feb 2025 17:59:03 +1100 Subject: [PATCH 11/14] coupled/shared different bw CABLE and UM7 --- shuffle.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/shuffle.sh b/shuffle.sh index b43120937..c4408af32 100755 --- a/shuffle.sh +++ b/shuffle.sh @@ -12,11 +12,13 @@ CABLE_SHARED_DIR=$CABLE_DIR/src/shared CABLE_ESM15_DIR=$CABLE_DIR/src/coupled/ESM1.5 CABLE_ESM16_DIR=$CABLE_DIR/src/coupled/esm16 CABLE_ESM_DIR=$CABLE_DIR/src/coupled/esm +CABLE_COUPLED_SHARED_DIR=$CABLE_DIR/src/coupled/shared UM7_REPO="git@github.com:ACCESS-NRI/UM7.git" UM7_BRANCH="64-the-great-library-shuffle" UM7_DIR="${WORK_DIR}/um7" UM7_ESM15_DIR=$UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/coupled/ESM1.5 +UM7_COUPLED_SHARED_DIR=$UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/coupled/shared UM7_ESM15_SUBDIR=$UM7_ESM15_DIR/CABLEfilesFromESM1.5 UM7_CABLE_DIR=$UM7_DIR/umbase_hg3/src/atmosphere/land_surface/cable @@ -108,18 +110,20 @@ rm -r $CABLE_DIR/src/coupled/ACCESS-CM2 mv -v $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/science $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/ mv -v $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/util $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/ mv -v $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/params $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/ +mv -v $UM7_COUPLED_SHARED_DIR $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/ rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/ cp -r $CABLE_DIR/src $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/ rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/offline rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/coupled/AM3 rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/coupled/JAC +rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/coupled/shared rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/params rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/science rm -r $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/util mv -v $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/params $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/ mv -v $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/science $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/ mv -v $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/util $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/ - +mv -v $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/shared $UM7_DIR/umbase_hg3/src/atmosphere/CABLE/src/coupled/ # Uncomment the #define lines for the pre-processor flags in the science code manually. # Perform the git commit/push manually once we verify this is all moved correctly. \ No newline at end of file From 24257c36f9fde156d385ee0a7a18ea230075157e Mon Sep 17 00:00:00 2001 From: Claire Carouge Date: Fri, 28 Feb 2025 18:03:46 +1100 Subject: [PATCH 12/14] Deal with casa_um_inout.F90 --- shuffle.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/shuffle.sh b/shuffle.sh index c4408af32..bbf98a9db 100755 --- a/shuffle.sh +++ b/shuffle.sh @@ -88,6 +88,7 @@ cp $UM7_ESM15_SUBDIR/cbl_um_init_soil.F90 $UM7_CABLE_DIR/ cp $UM7_ESM15_SUBDIR/cbl_um_init_soilsnow.F90 $UM7_CABLE_DIR/ cp $UM7_ESM15_SUBDIR/cbl_um_update_soilsnow.F90 $UM7_CABLE_DIR/ cp $UM7_ESM15_SUBDIR/cable_read_nml.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_SUBDIR/casa_um_inout.F90 $UM7_CABLE_DIR/ # casa_um_inout.F90 (currently in esm16/ but it needs to be deleted from there) # it is not there? From fce47c829f1dc7331299c5abaec131abfeec121d Mon Sep 17 00:00:00 2001 From: Claire Carouge Date: Fri, 28 Feb 2025 18:06:44 +1100 Subject: [PATCH 13/14] Bug fix for casa_um_inout --- shuffle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shuffle.sh b/shuffle.sh index bbf98a9db..48fe2a7e6 100755 --- a/shuffle.sh +++ b/shuffle.sh @@ -74,6 +74,7 @@ mkdir -p $UM7_CABLE_DIR # Move source into it (not sure if we need to delete the src location?) cp $UM7_ESM15_DIR/casa_types.F90 $UM7_CABLE_DIR/ cp $UM7_ESM15_DIR/pack_mod_cbl.F90 $UM7_CABLE_DIR/ +cp $UM7_ESM15_DIR/casa_um_inout.F90 $UM7_CABLE_DIR/ cp $UM7_ESM15_SUBDIR/cable_rad_driver.F90 $UM7_CABLE_DIR/ cp $UM7_ESM15_SUBDIR/cable_um_init.F90 $UM7_CABLE_DIR/ cp $UM7_ESM15_SUBDIR/cable_um_init_subrs.F90 $UM7_CABLE_DIR/ @@ -88,7 +89,6 @@ cp $UM7_ESM15_SUBDIR/cbl_um_init_soil.F90 $UM7_CABLE_DIR/ cp $UM7_ESM15_SUBDIR/cbl_um_init_soilsnow.F90 $UM7_CABLE_DIR/ cp $UM7_ESM15_SUBDIR/cbl_um_update_soilsnow.F90 $UM7_CABLE_DIR/ cp $UM7_ESM15_SUBDIR/cable_read_nml.F90 $UM7_CABLE_DIR/ -cp $UM7_ESM15_SUBDIR/casa_um_inout.F90 $UM7_CABLE_DIR/ # casa_um_inout.F90 (currently in esm16/ but it needs to be deleted from there) # it is not there? From 6155b7fc08c893855ac1701a4165b3a8fbf6c8dc Mon Sep 17 00:00:00 2001 From: Claire Carouge Date: Mon, 3 Mar 2025 09:33:39 +1100 Subject: [PATCH 14/14] One more --- shuffle.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/shuffle.sh b/shuffle.sh index 48fe2a7e6..0a97145d8 100755 --- a/shuffle.sh +++ b/shuffle.sh @@ -53,9 +53,6 @@ mv -v $CABLE_DIR/src/offline/cable_phenology.F90 $CABLE_SHARED_DIR/ mv -v $CABLE_DIR/src/offline/casa_ncdf.F90 $CABLE_SHARED_DIR/ mv -v $CABLE_DIR/src/offline/casa_offline_inout.F90 $CABLE_SHARED_DIR/ -echo rm $CABLE_DIR/src/offline/cable_pft_params.F90 -echo rm $CABLE_DIR/src/offline/cable_soil_params.F90 - # Remove them from offline (done in move above) # Remove from ESM1.5 (none) @@ -99,8 +96,8 @@ cp $UM7_ESM15_DIR/cable_surface_types.F90 $CABLE_ESM_DIR/ cp $UM7_ESM15_DIR/casa_landuse.F90 $CABLE_ESM_DIR/ cp $UM7_ESM15_SUBDIR/cable_define_types.F90 $CABLE_ESM_DIR/ cp $UM7_ESM15_SUBDIR/cable_iovars.F90 $CABLE_ESM_DIR/ -cp $UM7_ESM15_DIR/cable_pft_params_mod.F90 $CABLE_SHARED_DIR/ -cp $UM7_ESM15_DIR/cable_soil_params_mod.F90 $CABLE_SHARED_DIR/ +cp $UM7_ESM15_DIR/cable_pft_params_mod.F90 $CABLE_ESM_DIR/ +cp $UM7_ESM15_DIR/cable_soil_params_mod.F90 $CABLE_ESM_DIR/ # Remove unnecessary directories rm -r $CABLE_ESM16_DIR