CLM5-FruitTree implementation in eCLM

[Toeroeoe]

The Fruit Tree PFT developments by @odombro should be implemented in eCLM.
https://gmd.copernicus.org/articles/15/5167/2022/gmd-15-5167-2022.html

@odombro is this the latest development repo? https://github.com/odombro/CTSM/tree/CLM5_FruitTree_v1.1

[jjokella]

For reference also this branch on the HPSCTerrSys/clm5_0 repo that @AGonzalezNicolas worked on:

• https://github.com/HPSCTerrSys/clm5_0/tree/release-clm5.0_FruitTree

[AGonzalezNicolas]

@jjokella & @Toeroeoe that branch is clm5, not eclm.

[jjokella]

@jjokella & @Toeroeoe that branch is clm5, not eclm.

Yeah, was not meant as the solution, rather as one possible beginning for adding the FruitTree sub-module to eClM!

[AGonzalezNicolas]

It was decided to start with @tboas development (Winter Crops). It's still pending in PR #45

[kvrigor]

Perhaps Ana's repo might help with the Fruit Tree validation? https://github.com/HPSCTerrSys/REFcase_clm5.0_FTWC_for_FT

[AGonzalezNicolas]

It may need some changes/work. Some fields were adapted to FT (with apple tree) and WC.

[AGonzalezNicolas]

Following similar procedure in pull#45:

# *****************************
# 1. Set useful shell variables
# *****************************

# Directories
eCLM_DIR="path_to/eCLM"
WORKDIR="path_to_working_dir”

# FruitTree git info
FT_BRANCH="release-clm5.0_FruitTree"
FT_COMMIT_HASH="2c1722c9a43601576ac0e3edbca24db08062020a"

# ************************************************************
# 2. Generate fruit tree patch file from Olga's CLM5 fork
# ************************************************************

# Clone Olga's winter wheat CLM5 branch
cd ${WORKDIR}
git clone -b ${FT_BRANCH} https://github.com/odombro/CTSM/tree/release-clm5.0_FruitTree CLM5_FT
cd CLM5_FT

# Get CLM5 branch from CTSM repo
git remote add upstream https://github.com/ESCOMP/CTSM.git
git fetch upstream release-clm5.0

# Compare Olga's branch with release-clm5.0
git diff ${FT_COMMIT_HASH} upstream/release-clm5.0 --stat -- src

# Compare Olga's branch with release-clm5.0
          #check stats
          git diff ${FT_COMMIT_HASH} upstream/release-clm5.0 --stat – src
          # check differences
          git diff ${FT_COMMIT_HASH} upstream/release-clm5.0 -- src

# Create patch file with differences
git diff ${FT_COMMIT_HASH} upstream/release-clm5.0 -- src > FT_patch.diff
FT_PATCH=$(realpath FT_patch.diff)

# **************************************
# 3. Apply fruit tree patches to eCLM
# **************************************

# Go to eCLM and create fruit_tree branch
cd ${eCLM_DIR}
git checkout -b ${FT_BRANCH}

# Transform CLM5 paths in patch file to equivalent paths in eCLM.
sed -i 's#/src/#/src/clm5/#g' ${FT_PATCH}

# Apply patch
# --reject will create reject files (why apply patch hasn't worked)
git apply --reject --ignore-space-change --ignore-whitespace ${FT_PATCH}

Apply patch cannot be easily applied.