Skip to content

Updates to enable soil DA #3452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aerorahul merged 29 commits into from
Apr 23, 2025
Merged

Updates to enable soil DA #3452

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
cfa3041
Updates to
ClaraDraper-NOAA Mar 12, 2025
104f0f3
Merge branch 'develop' into feature/mv_regridding
ClaraDraper-NOAA Mar 14, 2025
9fa8c62
Tidy up.
ClaraDraper-NOAA Mar 14, 2025
edb2478
Updated spack-stack version so can load esmf/8.6.0
ClaraDraper-NOAA Mar 14, 2025
af97407
run soil DA test on all machines.
ClaraDraper-NOAA Mar 17, 2025
2dfc8b9
Linking sfc_regrid executable into global_workflow exec.
ClaraDraper-NOAA Mar 18, 2025
26920cd
Add new spack-stack to hercules, gaea[56], and added explicit
ClaraDraper-NOAA Mar 20, 2025
caeee2d
Amend previous commit.
ClaraDraper-NOAA Mar 21, 2025
fccda64
Merge branch 'develop' into feature/mv_regridding
ClaraDraper-NOAA Mar 21, 2025
e6326f5
Bugfix in GAEA env files.
ClaraDraper-NOAA Mar 24, 2025
91d3a4e
bugfix to Gaea[56] env files.
ClaraDraper-NOAA Mar 26, 2025
1dcecd4
remove errornous dependency of gfs_sfcanl on eupd
ClaraDraper-NOAA Mar 26, 2025
7fa94ab
py norms.
ClaraDraper-NOAA Mar 26, 2025
dc8162f
Merge branch 'develop' into feature/mv_regridding
ClaraDraper-NOAA Mar 28, 2025
2b26ddc
Updated modules on orion.
ClaraDraper-NOAA Mar 28, 2025
dce0350
script change to allow monitoring of 2m obs.
ClaraDraper-NOAA Mar 28, 2025
b27920b
Prevent regridding exec from being over-written.
ClaraDraper-NOAA Apr 3, 2025
d0aae40
Merge branch 'develop' into feature/mv_regridding
ClaraDraper-NOAA Apr 3, 2025
1ff8710
Restricting regid_ntasks to 6, for reproducibility.
ClaraDraper-NOAA Apr 4, 2025
c53f0e9
Merge branch 'develop' into feature/mv_regridding
ClaraDraper-NOAA Apr 4, 2025
fb8824a
Updated UFS_UTILS hash.
ClaraDraper-NOAA Apr 4, 2025
289c668
initialize in hofx_2m_sfcfile in exgdas_enkf_update.sh
ClaraDraper-NOAA Apr 8, 2025
f7ccd13
Merge branch 'develop' into feature/mv_regridding
ClaraDraper-NOAA Apr 15, 2025
1643aa5
Merged soil DA into hybatm test, and removed separate soil DA test.
ClaraDraper-NOAA Apr 15, 2025
7a07691
coding norms.
ClaraDraper-NOAA Apr 15, 2025
a8dd91a
Removed soilDA test yaml.
ClaraDraper-NOAA Apr 15, 2025
7901ff7
Merge branch 'develop' into feature/mv_regridding
ClaraDraper-NOAA Apr 16, 2025
237608b
Update dev/jobs/sfcanl.sh
aerorahul Apr 21, 2025
cbe0916
Merge branch 'develop' into feature/mv_regridding
aerorahul Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ci/cases/pr/C96C48_hybatmDA.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ experiment:
mode: cycled

arguments:
account: {{ 'HPC_ACCOUNT' | getenv }}
account: {{ 'HPC_ACCOUNT' | getenv }}
pslot: {{ 'pslot' | getenv }}
app: ATM
Expand Down
21 changes: 21 additions & 0 deletions ci/cases/pr/C96C48_hybatmsoilDA.yaml
View file
Open in desktop

@CoryMartin-NOAA CoryMartin-NOAA Apr 8, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we just combine this with the existing CI test?

@KateFriedman-NOAA KateFriedman-NOAA Apr 8, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I second this. Could this be combined with the existing ci/cases/pr/C96C48_hybatmDA.yaml?

@ClaraDraper-NOAA ClaraDraper-NOAA Apr 8, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I asked @CatherineThomas-NOAA about this, and I think she's planning to include it in the GFSv17 test. Would this suffice?

It's useful for me to have the test there, but if it's cludging up your tests I don't mind removing it.

@CoryMartin-NOAA CoryMartin-NOAA Apr 8, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we just ensure that the hybatmDA test includes the soil DA work, no need to duplicate it then

@ClaraDraper-NOAA ClaraDraper-NOAA Apr 8, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can turn on the soil DA in the hybatmDA test, and delete the current test. This will require establishing a new yaml for the combined test, since gfs_defaults_ci.yaml is used by multiple tests that don't have ensembles (so the soil DA will fail).

What does this do: DO_TEST_MODE: "YES" (This is currently NO for the snowDA test, and YES for the hybatm)

@CoryMartin-NOAA CoryMartin-NOAA Apr 15, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DavidNew-NOAA can you give Clara an explanation of how this is used combined with GDASApp?

@DavidNew-NOAA DavidNew-NOAA Apr 15, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ClaraDraper-NOAA DO_TEST_MODE: "YES" turns on JEDI application tests. It's referenced in the JCB algorithm YAMLs for various jobs, telling JCB what the parameters (reference file, test tolerances, etc) are for the associated JEDI application.

For atm 3dvar for example:

https://github.com/NOAA-EMC/GDASApp/blob/91b6c1d25fabc3eb439ae66b925e0536b8f022ac/test/gw-ci/atm/jcb-prototype_3dvar_ufs_hybatmDA.yaml.j2#L36

For this example, those parameters would go in here:

https://github.com/NOAA-EMC/jcb-algorithms/blob/1c39f50c41a51e15e8e839ec86aff0cb71b7406f/3dvar.yaml.j2#L100

@ClaraDraper-NOAA ClaraDraper-NOAA Apr 15, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @DavidNew-NOAA. Is this still relevant here, even though this test is not running JEDI?

If so, I assume I'll need to create new baselines once I add the soil DA to the test.

@DavidNew-NOAA DavidNew-NOAA Apr 15, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, not really relevant here, though in one case it's used for testing in GSI, reducing the number of iterations in the minimizer:

global-workflow/parm/config/gfs/config.anal

Line 33 in 6021dd2

if [[ ${DO_TEST_MODE} = "YES" ]]; then

So you can more or less use it for whatever you want in the context of testing.

@ClaraDraper-NOAA ClaraDraper-NOAA Apr 15, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks - I left DO_TEST_MODE: "YES" to keep the faster minimization.

Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
experiment:
system: gfs
mode: cycled

arguments:
account: {{ 'HPC_ACCOUNT' | getenv }}
pslot: {{ 'pslot' | getenv }}
app: ATM
resdetatmos: 96
resensatmos: 48
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20241120
idate: 2021122012
edate: 2021122100
nens: 2
interval: 24
start: cold
yaml: {{ HOMEgfs }}/ci/cases/yamls/atmsoilDA_defaults_ci.yaml


12 changes: 6 additions & 6 deletions env/GAEAC5.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,8 @@ case ${step} in
fi
export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"

# REGRID requires multiple of 6 tasks
ntdiv6=$((ntasks/6))
ntasks_regrid=$((ntdiv6*6))
if [[ ${ntasks_regrid} -gt 36 ]]; then
ntasks_regrid=36
fi
# REGRID requires 6 tasks for reproducibility
ntasks_regrid=6
export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "

;;
Expand Down Expand Up @@ -287,6 +283,10 @@ case ${step} in
fi
export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"

# REGRID requires 6 tasks for reproducibility
ntasks_regrid=6
export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "

;;
"epos")

Expand Down
12 changes: 6 additions & 6 deletions env/GAEAC6.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,8 @@ case ${step} in
fi
export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"

# REGRID requires multiple of 6 tasks
ntdiv6=$((ntasks/6))
ntasks_regrid=$((ntdiv6*6))
if [[ ${ntasks_regrid} -gt 36 ]]; then
ntasks_regrid=36
fi
# REGRID requires 6 tasks for reproducibility
ntasks_regrid=6
export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "

;;
Expand Down Expand Up @@ -294,6 +290,10 @@ case ${step} in
fi
export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"

# REGRID requires 6 tasks for reproducibility
ntasks_regrid=6
export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "

;;
"epos")

Expand Down
15 changes: 4 additions & 11 deletions env/HERA.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,8 @@ elif [[ "${step}" = "sfcanl" ]]; then
export NTHREADS_CYCLE=${threads_per_task:-14}
export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"

# REGRID requires multiple of 6 tasks
ntdiv6=$((ntasks/6))
ntasks_regrid=$((ntdiv6*6))
if [[ ${ntasks_regrid} -gt 36 ]]; then
ntasks_regrid=36
fi
# REGRID requires 6 tasks for reproducibility
ntasks_regrid=6
export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "

elif [[ "${step}" = "eobs" ]]; then
Expand Down Expand Up @@ -281,11 +277,8 @@ elif [[ "${step}" = "esfc" ]]; then
fi
export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"

ntdiv6=$((ntasks/6))
ntasks_regrid=$((ntdiv6*6))
if [[ ${ntasks_regrid} -gt 36 ]]; then
ntasks_regrid=36
fi
# REGRID requires 6 tasks for reproducibility
ntasks_regrid=6
export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "

elif [[ "${step}" = "epos" ]]; then
Expand Down
15 changes: 4 additions & 11 deletions env/HERCULES.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,12 +206,8 @@ case ${step} in
fi
export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"

# REGRID requires multiple of 6 tasks
ntdiv6=$((ntasks/6))
ntasks_regrid=$((ntdiv6*6))
if [[ ${ntasks_regrid} -gt 36 ]]; then
ntasks_regrid=36
fi
# REGRID requires 6 tasks for reproducibility
ntasks_regrid=6
export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "
;;
"eobs")
Expand Down Expand Up @@ -298,11 +294,8 @@ case ${step} in
fi
export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"

ntdiv6=$((ntasks/6))
ntasks_regrid=$((ntdiv6*6))
if [[ ${ntasks_regrid} -gt 36 ]]; then
ntasks_regrid=36
fi
# REGRID requires 6 tasks for reproducibility
ntasks_regrid=6
export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "

;;
Expand Down
15 changes: 4 additions & 11 deletions env/JET.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,8 @@ elif [[ "${step}" = "sfcanl" ]]; then
fi
export APRUN_CYCLE="${APRUN_default}"

# REGRID requires multiple of 6 tasks
ntdiv6=$((ntasks/6))
ntasks_regrid=$((ntdiv6*6))
if [[ ${ntasks_regrid} -gt 36 ]]; then
ntasks_regrid=36
fi
# REGRID requires 6 tasks for reproducibility
ntasks_regrid=6
export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "

elif [[ "${step}" = "eobs" ]]; then
Expand Down Expand Up @@ -256,11 +252,8 @@ elif [[ "${step}" = "esfc" ]]; then
fi
export APRUN_CYCLE="${APRUN_default}"

ntdiv6=$((ntasks/6))
ntasks_regrid=$((ntdiv6*6))
if [[ ${ntasks_regrid} -gt 36 ]]; then
ntasks_regrid=36
fi
# REGRID requires 6 tasks for reproducibility
ntasks_regrid=6
export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "

elif [[ "${step}" = "epos" ]]; then
Expand Down
15 changes: 4 additions & 11 deletions env/ORION.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,12 +205,8 @@ elif [[ "${step}" = "sfcanl" ]]; then
fi
export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"

# REGRID requires multiple of 6 tasks
ntdiv6=$((ntasks/6))
ntasks_regrid=$((ntdiv6*6))
if [[ ${ntasks_regrid} -gt 36 ]]; then
ntasks_regrid=36
fi
# REGRID requires 6 tasks for reproducibility
ntasks_regrid=6
export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "

elif [[ "${step}" = "eobs" ]]; then
Expand Down Expand Up @@ -289,11 +285,8 @@ elif [[ "${step}" = "esfc" ]]; then
fi
export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"

ntdiv6=$((ntasks/6))
ntasks_regrid=$((ntdiv6*6))
if [[ ${ntasks_regrid} -gt 36 ]]; then
ntasks_regrid=36
fi
# REGRID requires 6 tasks for reproducibility
ntasks_regrid=6
export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "

elif [[ "${step}" = "epos" ]]; then
Expand Down
15 changes: 4 additions & 11 deletions env/WCOSS2.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,8 @@ elif [[ "${step}" = "sfcanl" ]]; then
fi
export APRUN_CYCLE="${APRUN_default}"

# REGRID requires multiple of 6 tasks
ntdiv6=$((ntasks/6))
ntasks_regrid=$((ntdiv6*6))
if [[ ${ntasks_regrid} -gt 36 ]]; then
ntasks_regrid=36
fi
# REGRID requires 6 tasks for reproducibility
ntasks_regrid=6
export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "

elif [[ "${step}" = "eobs" ]]; then
Expand Down Expand Up @@ -303,11 +299,8 @@ elif [[ "${step}" = "esfc" ]]; then
fi
export APRUN_CYCLE="${APRUN_default} -ppn ${tasks_per_node_cycle} --cpu-bind depth --depth ${NTHREADS_CYCLE}"

ntdiv6=$((ntasks/6))
ntasks_regrid=$((ntdiv6*6))
if [[ ${ntasks_regrid} -gt 36 ]]; then
ntasks_regrid=36
fi
# REGRID requires 6 tasks for reproducibility
ntasks_regrid=6
export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "

elif [[ "${step}" = "epos" ]]; then
Expand Down
3 changes: 0 additions & 3 deletions jobs/rocoto/esfc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ set -x

###############################################################
# Source FV3GFS workflow modules
# For DO_GSISOILDA=YES need to switch to ufsda modules
# until g-w issue 3390 is resolved.
. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
#. ${HOMEgfs}/ush/load_ufsda_modules.sh
status=$?
if [[ ${status} -ne 0 ]]; then
exit "${status}"
Expand Down
3 changes: 0 additions & 3 deletions jobs/rocoto/sfcanl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ set -x

###############################################################
# Source FV3GFS workflow modules
# For DO_GSISOILDA=YES need to switch to ufsda modules
# until g-w issue 3390 is resolved.
. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
#. ${HOMEgfs}/ush/load_ufsda_modules.sh
status=$?
if [[ ${status} -ne 0 ]]; then
exit "${status}"
Expand Down
1 change: 1 addition & 0 deletions modulefiles/module_base.gaeac5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))
load(pathJoin("hdf5", (os.getenv("hdf5_ver") or "None")))
load(pathJoin("netcdf-c", (os.getenv("netcdf_c_ver") or "None")))
load(pathJoin("netcdf-fortran", (os.getenv("netcdf_fortran_ver") or "None")))
load(pathJoin("esmf", (os.getenv("esmf_ver") or "None")))
Comment thread
DavidHuber-NOAA marked this conversation as resolved.
load(pathJoin("perlbrew", (os.getenv("perl_ver") or "None")))

load(pathJoin("nco", (os.getenv("nco_ver") or "None")))
Expand Down
1 change: 1 addition & 0 deletions modulefiles/module_base.gaeac6.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))
load(pathJoin("hdf5", (os.getenv("hdf5_ver") or "None")))
load(pathJoin("netcdf-c", (os.getenv("netcdf_c_ver") or "None")))
load(pathJoin("netcdf-fortran", (os.getenv("netcdf_fortran_ver") or "None")))
load(pathJoin("esmf", (os.getenv("esmf_ver") or "None")))
load(pathJoin("perlbrew", (os.getenv("perl_ver") or "None")))

load(pathJoin("nco", (os.getenv("nco_ver") or "None")))
Expand Down
1 change: 1 addition & 0 deletions modulefiles/module_base.hera.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ load(pathJoin("perl", (os.getenv("perl_ver") or "None")))
load(pathJoin("hdf5", (os.getenv("hdf5_ver") or "None")))
load(pathJoin("netcdf-c", (os.getenv("netcdf_c_ver") or "None")))
load(pathJoin("netcdf-fortran", (os.getenv("netcdf_fortran_ver") or "None")))
load(pathJoin("esmf", (os.getenv("esmf_ver") or "None")))

load(pathJoin("nco", (os.getenv("nco_ver") or "None")))
load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
Expand Down
1 change: 1 addition & 0 deletions modulefiles/module_base.hercules.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))
load(pathJoin("hdf5", (os.getenv("hdf5_ver") or "None")))
load(pathJoin("netcdf-c", (os.getenv("netcdf_c_ver") or "None")))
load(pathJoin("netcdf-fortran", (os.getenv("netcdf_fortran_ver") or "None")))
load(pathJoin("esmf", (os.getenv("esmf_ver") or "None")))

load(pathJoin("nco", (os.getenv("nco_ver") or "None")))
load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
Expand Down
1 change: 1 addition & 0 deletions modulefiles/module_base.orion.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))
load(pathJoin("hdf5", (os.getenv("hdf5_ver") or "None")))
load(pathJoin("netcdf-c", (os.getenv("netcdf_c_ver") or "None")))
load(pathJoin("netcdf-fortran", (os.getenv("netcdf_fortran_ver") or "None")))
load(pathJoin("esmf", (os.getenv("esmf_ver") or "None")))

load(pathJoin("nco", (os.getenv("nco_ver") or "None")))
load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
Expand Down
2 changes: 1 addition & 1 deletion parm/config/gfs/config.esfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [[ ${DO_GSISOILDA} == "YES" ]]; then
export GCYCLE_DO_SOILINCR=".true."
export GCYCLE_INTERP_LANDINCR=".false."
export LSOIL_INCR=2
export REGRID_EXEC="${HOMEgfs}/sorc/gdas.cd/build/bin/regridStates.x"
export REGRID_EXEC="${HOMEgfs}/exec/regridStates.x"
fi

echo "END: config.esfc"
2 changes: 1 addition & 1 deletion parm/config/gfs/config.sfcanl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if [[ "${DO_GSISOILDA}" == "YES" ]]; then
export GCYCLE_DO_SOILINCR=".true."
export GCYCLE_INTERP_LANDINCR=".false."
export LSOIL_INCR=2
export REGRID_EXEC=${REGRID_EXEC:-"${HOMEgfs}/sorc/gdas.cd/build/bin/regridStates.x"}
export REGRID_EXEC="${HOMEgfs}/exec/regridStates.x"
fi

echo "END: config.sfcanl"
2 changes: 1 addition & 1 deletion scripts/exgdas_enkf_update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ for imem in $(seq 1 $NMEM_ENS); do
for FHR in $nfhrs; do
${NLN} "${COMIN_ATMOS_HISTORY_MEM_PREV}/${GPREFIX}atmf00${FHR}${ENKF_SUFFIX}.nc" \
"sfg_${PDY}${cyc}_fhr0${FHR}_${memchar}"
if [[ "${DO_GSISOILDA}" = "YES" ]]; then
if [[ "${hofx_2m_sfcfile}" = ".true." ]]; then
Comment thread
DavidHuber-NOAA marked this conversation as resolved.
${NLN} "${COMIN_ATMOS_HISTORY_MEM_PREV}/${GPREFIX}sfcf00${FHR}${ENKF_SUFFIX}.nc" \
"bfg_${PDY}${cyc}_fhr0${FHR}_${memchar}"
fi
Expand Down
5 changes: 2 additions & 3 deletions sorc/link_workflow.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ if [[ -s "upp.x" ]]; then
fi
${LINK_OR_COPY} "${HOMEgfs}/sorc/upp.fd/exec/upp.x" .

for ufs_utilsexe in emcsfc_ice_blend emcsfc_snow2mdl global_cycle fregrid; do
for ufs_utilsexe in emcsfc_ice_blend emcsfc_snow2mdl global_cycle fregrid regridStates.x; do
if [[ -s "${ufs_utilsexe}" ]]; then
rm -f "${ufs_utilsexe}"
fi
Expand Down Expand Up @@ -399,8 +399,7 @@ if [[ -d "${HOMEgfs}/sorc/gdas.cd/build" ]]; then
"gdasapp_land_ensrecenter.x"
"bufr2ioda.x"
"calcfIMS.exe"
"apply_incr.exe"
"regridStates.x")
"apply_incr.exe")
for gdasexe in "${JEDI_EXE[@]}"; do
if [[ -s "${gdasexe}" ]]; then
rm -f "${gdasexe}"
Expand Down
2 changes: 1 addition & 1 deletion sorc/ufs_utils.fd
Open in desktop
Submodule ufs_utils.fd updated 49 files
+1 −0 CMakeLists.txt
+1 −0 README.md
+4 −0 docs/main.md
+1 −0 docs/source/ufs_utils.rst
+1 −1 fix/link_fixdirs.sh
+2 −2 modulefiles/build.gaeac5.intel.lua
+2 −2 modulefiles/build.gaeac6.intel.lua
+19 −8 modulefiles/build.hera.gnu.lua
+2 −2 modulefiles/build.hera.intel.lua
+2 −2 modulefiles/build.hera.intelllvm.lua
+2 −2 modulefiles/build.hercules.intel.lua
+2 −2 modulefiles/build.hercules.intelllvm.lua
+2 −2 modulefiles/build.jet.intel.lua
+2 −2 modulefiles/build.jet.intelllvm.lua
+1 −1 modulefiles/build.noaacloud.intel.lua
+2 −2 modulefiles/build.orion.intel.lua
+2 −2 modulefiles/build.orion.intelllvm.lua
+2 −2 modulefiles/build.s4.intel.lua
+2 −2 modulefiles/build.wcoss2.intel.lua
+1 −1 modulefiles/common4noaacloud.lua
+123 −0 reg_tests/regrid_sfc/driver.sh
+135 −0 reg_tests/regrid_sfc/gauss2fv3incr.sh
+20 −4 reg_tests/rt.sh
+6 −5 reg_tests/snow2mdl/driver.hera.sh
+9 −7 reg_tests/snow2mdl/driver.hercules.sh
+6 −5 reg_tests/snow2mdl/driver.jet.sh
+8 −5 reg_tests/snow2mdl/driver.orion.sh
+6 −5 reg_tests/snow2mdl/driver.wcoss2.sh
+4 −6 reg_tests/snow2mdl/snow2mdl.global.sh
+86 −0 reg_tests/snow2mdl/snow2mdl.hemi.sh
+0 −56 reg_tests/snow2mdl/snow2mdl.ops.sh
+3 −5 scripts/exemcsfc_global_sfc_prep.sh
+3 −0 sorc/CMakeLists.txt
+46 −0 sorc/regrid_sfc.fd/CMakeLists.txt
+16 −0 sorc/regrid_sfc.fd/docs/CMakeLists.txt
+2,572 −0 sorc/regrid_sfc.fd/docs/Doxyfile.in
+7 −0 sorc/regrid_sfc.fd/docs/README.md
+31 −0 sorc/regrid_sfc.fd/docs/regrid_sfc.md
+431 −0 sorc/regrid_sfc.fd/grids_IO.F90
+95 −0 sorc/regrid_sfc.fd/readin_setup.F90
+269 −0 sorc/regrid_sfc.fd/regridStates.F90
+56 −0 sorc/regrid_sfc.fd/utils.F90
+3 −0 tests/CMakeLists.txt
+21 −0 tests/regrid_sfc/CMakeLists.txt
+26 −0 tests/regrid_sfc/data/regrid.nml
+55 −0 tests/regrid_sfc/ftst_read_namelist.F90
+51 −28 ush/emcsfc_snow.sh
+211 −0 util/gdas_init/driver.gaeac6.sh
+2 −0 util/gdas_init/set_fixed_files.sh
6 changes: 1 addition & 5 deletions ush/regrid_gsiSfcIncr_to_tile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
# Clara Draper, Dec 2024
#-------------------------------------------------------------------------------------------------

# temporary files on hera, until g-w issue 3392 is resolved.
TMP_FIX_FILES=/scratch2/BMC/gsienkf/Clara.Draper/gw_new_fix_files/


export PGMOUT=${PGMOUT:-${pgmout:-'&1'}}
export PGMERR=${PGMERR:-${pgmerr:-'&2'}}
export REDOUT=${REDOUT:-'1>'}
Expand Down Expand Up @@ -71,7 +67,7 @@ cat << EOF > regrid.nml
EOF

# input, fixed files
${NCP} "${TMP_FIX_FILES}/gaussian.${LONB_CASE_IN}.${LATB_CASE_IN}.nc" \
${NCP} "${FIXorog}/${CASE_IN}/gaussian.${LONB_CASE_IN}.${LATB_CASE_IN}.nc" \
"${DATA}/gaussian_scrip.nc"

# output, fixed files
Expand Down
2 changes: 1 addition & 1 deletion versions/build.gaeac5.ver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export stack_intel_ver=2023.2.0
export stack_cray_mpich_ver=8.1.28
export spack_env=gsi-addon-dev
export spack_env=gsi-addon-dev-fms-2024.01
source "${HOMEgfs:-}/versions/spack.ver"
export spack_mod_path="/ncrc/proj/epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
2 changes: 1 addition & 1 deletion versions/build.gaeac6.ver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export stack_intel_ver=2023.2.0
export stack_cray_mpich_ver=8.1.29
export spack_env=gsi-addon
export spack_env=gsi-addon-dev-fms-2024.01
Comment thread
DavidHuber-NOAA marked this conversation as resolved.
source "${HOMEgfs:-}/versions/spack.ver"
export spack_mod_path="/ncrc/proj/epic/spack-stack/c6/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
2 changes: 1 addition & 1 deletion versions/build.hera.ver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export stack_intel_ver=2021.5.0
export stack_impi_ver=2021.5.1
export spack_env=gsi-addon-dev-rocky8
export spack_env=gsi-addon-dev-fms-2024.01
source "${HOMEgfs:-}/versions/spack.ver"
export spack_mod_path="/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
2 changes: 1 addition & 1 deletion versions/build.hercules.ver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export stack_intel_ver=2021.9.0
export stack_impi_ver=2021.9.0
export intel_mkl_ver=2023.1.0
export spack_env=gsi-addon-env
export spack_env=gsi-addon-dev-fms-2024.01
source "${HOMEgfs:-}/versions/spack.ver"
export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
2 changes: 1 addition & 1 deletion versions/build.orion.ver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export stack_intel_ver=2021.9.0
export stack_impi_ver=2021.9.0
export spack_env=gsi-addon-env-rocky9
export spack_env=gsi-addon-dev-fms-2024.01
source "${HOMEgfs:-}/versions/spack.ver"
export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
Loading