From f19ab63802d3b2524d7cadb5fc1f0d0b0f9bc2a3 Mon Sep 17 00:00:00 2001 From: "guoqing.ge" Date: Thu, 21 May 2026 10:39:27 -0600 Subject: [PATCH 1/2] add a new option 'chemrrfs' to build.all --- sorc/build.all | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sorc/build.all b/sorc/build.all index 0bb97c481f..e1bcab5432 100755 --- a/sorc/build.all +++ b/sorc/build.all @@ -11,18 +11,25 @@ cleanup() { } trap cleanup SIGINT SIGTERM -if [[ "${1,,}" == "chem" ]] || [[ "${2,,}" == "chem" ]]; then +if [[ "${1,,}" == chem* ]] || [[ "${2,,}" == chem* ]]; then cd "${HOMErrfs}/sorc" || exit 1 echo "Option 'chem' found in the command line, downloading chem-specific MPAS-Model ......" - remote_url="https://github.com/cheMPAS-Fire/MPAS-Model" - branch_commit="chem/develop" # a branch name or a commit hash + if [[ "${1,,}" == chemrrfs ]] || [[ "${2,,}" == chemrrfs ]]; then + remote_url="https://github.com/RRFSx/MPAS-Model" + branch_commit="chemrrfs" + else + remote_url="https://github.com/cheMPAS-Fire/MPAS-Model" + branch_commit="chem/develop" # a branch name or a commit hash + fi mv MPAS-Model "MPAS-Model.$(date +%s)" # save a copy of current MPAS-Model git clone "${remote_url}" MPAS-Model cd "${HOMErrfs}/sorc/MPAS-Model" || exit 1 git checkout "${branch_commit}" git submodule update --init --recursive - # allow smoke_coarse in histlist_3d_smoke - cp "${HOMErrfs}/fix/chemistry/mpassit/histlist_3d_smoke.coarse" "${HOMErrfs}/fix/chemistry/mpassit/histlist_3d_smoke" + if [[ "${branch_commit}" != "chemrrfs" ]]; then + # allow smoke_coarse in histlist_3d_smoke + cp "${HOMErrfs}/fix/chemistry/mpassit/histlist_3d_smoke.coarse" "${HOMErrfs}/fix/chemistry/mpassit/histlist_3d_smoke" + fi fi cd "${HOMErrfs}/sorc" || exit 1 From f96e0287c7070dbcf9ceeb5030af7480e1ad16f9 Mon Sep 17 00:00:00 2001 From: "guoqing.ge" Date: Thu, 21 May 2026 10:49:07 -0600 Subject: [PATCH 2/2] remove copying histlist_3d_smoke.coarse for cheMPAS --- sorc/build.all | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sorc/build.all b/sorc/build.all index e1bcab5432..7f89412a3e 100755 --- a/sorc/build.all +++ b/sorc/build.all @@ -26,10 +26,6 @@ if [[ "${1,,}" == chem* ]] || [[ "${2,,}" == chem* ]]; then cd "${HOMErrfs}/sorc/MPAS-Model" || exit 1 git checkout "${branch_commit}" git submodule update --init --recursive - if [[ "${branch_commit}" != "chemrrfs" ]]; then - # allow smoke_coarse in histlist_3d_smoke - cp "${HOMErrfs}/fix/chemistry/mpassit/histlist_3d_smoke.coarse" "${HOMErrfs}/fix/chemistry/mpassit/histlist_3d_smoke" - fi fi cd "${HOMErrfs}/sorc" || exit 1