Skip to content

Commit

Permalink
Update GDASapp hash to move JCB into GDASapp (#2665)
Browse files Browse the repository at this point in the history
This PR moves JCB into GDASapp. The PR
also bumps up the hash of GDASapp to what is in `feature/move_jcb`,
which at time of writing is develop plus the absorption of JCB into
GDASapp.
Note that I also took the changes from
#2641 to follow the
testing @RussTreadon-NOAA has done.
  • Loading branch information
danholdaway authored Jun 14, 2024
1 parent 6c93b45 commit 5af325a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,3 @@
[submodule "sorc/gsi_monitor.fd"]
path = sorc/gsi_monitor.fd
url = https://github.com/NOAA-EMC/GSI-Monitor.git
[submodule "sorc/jcb"]
path = sorc/jcb
url = https://github.com/noaa-emc/jcb
fetchRecurseSubmodules = false
2 changes: 1 addition & 1 deletion sorc/gdas.cd
Submodule gdas.cd updated 4 files
+4 −0 .gitmodules
+5 −0 mains/gdas.cc
+1 −1 parm/jcb-gdas
+1 −0 sorc/jcb
1 change: 0 additions & 1 deletion sorc/jcb
Submodule jcb deleted from f62b9d
10 changes: 9 additions & 1 deletion sorc/link_workflow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,21 @@ source "${HOMEgfs}/versions/fix.ver"

# Link python pacakges in ush/python
# TODO: This will be unnecessary when these are part of the virtualenv
packages=("wxflow" "jcb")
packages=("wxflow")
for package in "${packages[@]}"; do
cd "${HOMEgfs}/ush/python" || exit 1
[[ -s "${package}" ]] && rm -f "${package}"
${LINK} "${HOMEgfs}/sorc/${package}/src/${package}" .
done

# Link GDASapp python packages in ush/python
packages=("jcb")
for package in "${packages[@]}"; do
cd "${HOMEgfs}/ush/python" || exit 1
[[ -s "${package}" ]] && rm -f "${package}"
${LINK} "${HOMEgfs}/sorc/gdas.cd/sorc/${package}/src/${package}" .
done

# Link wxflow in workflow and ci/scripts
# TODO: This will be unnecessary when wxflow is part of the virtualenv
cd "${HOMEgfs}/workflow" || exit 1
Expand Down

0 comments on commit 5af325a

Please sign in to comment.