Skip to content

Update JEDI hashes (20250407) #1595

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
RussTreadon-NOAA merged 10 commits into from
Apr 7, 2025
Merged

Update JEDI hashes (20250407) #1595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
18fffc6
Update to new stable build on 20250401
RussTreadon-NOAA Apr 1, 2025
f3528a9
Merge branch 'develop' into feature/stable-nightly
RussTreadon-NOAA Apr 2, 2025
000e6c2
Update to new stable build on 20250402
RussTreadon-NOAA Apr 2, 2025
9afa2cc
Merge branch 'develop' into feature/stable-nightly
RussTreadon-NOAA Apr 3, 2025
d60b252
Update to new stable build on 20250403
RussTreadon-NOAA Apr 3, 2025
fbd5d21
Merge branch 'develop' into feature/stable-nightly
RussTreadon-NOAA Apr 4, 2025
d3b5f6c
Update to new stable build on 20250404
RussTreadon-NOAA Apr 4, 2025
e7a3194
update to restore functionality of test_gdasapp_atm_jjob (#1594)
RussTreadon-NOAA Apr 5, 2025
53276d4
Update to new stable build on 20250405
RussTreadon-NOAA Apr 5, 2025
62c3995
remove hardwired prod_util path, load prod_util module (#1594)
RussTreadon-NOAA Apr 7, 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 modulefiles/GDAS/hera.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ setenv('MPIEXEC_NPROC', mpinproc)
setenv("CRTM_FIX","/scratch1/NCEPDEV/da/role.jedipara/GDASApp/fix/crtm/2.4.0")
setenv("GDASAPP_TESTDATA","/scratch1/NCEPDEV/da/role.jedipara/GDASApp/testdata")
setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/scratch1/NCEPDEV/da/role.jedipara/GDASApp/unittestdata")
--prepend_path("PATH","/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/intel-18.0.5.274/prod_util/1.2.2/bin")

whatis("Name: ".. pkgName)
whatis("Version: ".. pkgVersion)
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/GDAS/hercules.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ load("py-pybind11/2.11.0")
load("contrib/0.1")
load("noaatools/3.1")
load("rocoto/1.3.7")
load("prod_util/2.1.1")

load("hpc/1.2.0")
unload("python/3.10.13")
Expand All @@ -84,7 +85,6 @@ setenv('MPIEXEC_NPROC', mpinproc)
setenv("CRTM_FIX","/work2/noaa/da/role-da/GDASApp/fix/crtm/2.4.0")
setenv("GDASAPP_TESTDATA","/work2/noaa/da/role-da/GDASApp/testdata")
setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/work2/noaa/da/role-da/GDASApp/unittestdata")
prepend_path("PATH","/apps/contrib/NCEP/libs/hpc-stack/intel-2018.4/prod_util/1.2.2/bin")

execute{cmd="ulimit -s unlimited",modeA={"load"}}

Expand Down
2 changes: 1 addition & 1 deletion modulefiles/GDAS/orion.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ load("py-pybind11/2.11.0")
load("contrib/0.1")
load("noaatools/3.1")
load("rocoto/1.3.7")
load("prod_util/2.1.1")

load("hpc/1.2.0")
unload("python/3.10.13")
Expand All @@ -84,7 +85,6 @@ setenv('MPIEXEC_NPROC', mpinproc)
setenv("CRTM_FIX","/work2/noaa/da/role-da/GDASApp/fix/crtm/2.4.0")
setenv("GDASAPP_TESTDATA","/work2/noaa/da/role-da/GDASApp/testdata")
setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/work2/noaa/da/role-da/GDASApp/unittestdata")
prepend_path("PATH","/apps/contrib/NCEP/libs/hpc-stack/intel-2018.4/prod_util/1.2.2/bin")

execute{cmd="ulimit -s unlimited",modeA={"load"}}

Expand Down
2 changes: 1 addition & 1 deletion sorc/fv3-jedi
Open in desktop
Submodule fv3-jedi updated 5 files
+8 −0 src/fv3jedi/Increment/Increment.cc
+1 −0 src/fv3jedi/Increment/Increment.h
+47 −30 src/fv3jedi/LinearVariableChange/LinearVariableChange.cc
+2 −1 src/fv3jedi/LinearVariableChange/LinearVariableChange.h
+1 −0 src/fv3jedi/State/State.h
2 changes: 1 addition & 1 deletion sorc/ioda
Open in desktop
Submodule ioda updated 16 files
+3 −0 src/CMakeLists.txt
+16 −0 src/containers/FrameCols.cpp
+1 −0 src/containers/FrameCols.h
+16 −0 src/containers/FrameRows.cpp
+1 −0 src/containers/FrameRows.h
+8 −0 src/containers/IFrame.h
+6 −23 src/mains/filterObs/filterObs.hpp
+85 −0 src/reader/filter/filterObsContainer.cpp
+33 −0 src/reader/filter/filterObsContainer.hpp
+10 −0 test/CMakeLists.txt
+270 −0 test/ioda/ReaderFilter.h
+0 −19 test/mains/TestIodaObsSpaceOSDF.cc
+16 −0 test/mains/TestReaderFilter.cc
+0 −1 test/testinput/iodatest_filter_obs_amsua.yaml
+0 −1 test/testinput/iodatest_filter_obs_sondes.yaml
+46 −0 test/testinput/iodatest_reader_filter.yaml
2 changes: 1 addition & 1 deletion sorc/oops
Open in desktop
Submodule oops updated 8 files
+14 −11 src/oops/assimilation/GETKFSolver.h
+1 −1 src/oops/assimilation/GETKFSolverPert.h
+1 −1 src/oops/assimilation/LETKFSolver.h
+2 −2 src/oops/assimilation/LETKFSolverPert.h
+38 −19 src/oops/assimilation/LocalEnsembleSolver.h
+0 −135 src/oops/util/AtlasArrayUtil.cc
+22 −44 src/oops/util/AtlasArrayUtil.h
+0 −5 src/test/util/ArrayUtil.h
2 changes: 1 addition & 1 deletion sorc/saber
Open in desktop
Submodule saber updated 21 files
+9 −1 quench/src/Fields.cc
+1 −0 quench/src/Fields.h
+2 −0 quench/src/Increment.h
+3 −0 src/saber/blocks/SaberBlockParametersBase.h
+9 −3 src/saber/blocks/SaberOuterBlockChain.cc
+7 −0 src/saber/blocks/SaberOuterBlockChain.h
+6 −0 src/saber/blocks/SaberParametricBlockChain.cc
+7 −0 src/saber/blocks/SaberParametricBlockChain.h
+71 −71 src/saber/fastlam/FastLAM.cc
+1 −1 src/saber/fastlam/FastLAM.h
+281 −282 src/saber/fastlam/LayerBase.cc
+2 −2 src/saber/fastlam/LayerBase.h
+124 −124 src/saber/fastlam/LayerHalo.cc
+171 −173 src/saber/fastlam/LayerRC.cc
+8 −8 src/saber/fastlam/LayerRC.h
+223 −227 src/saber/fastlam/LayerSpec.cc
+10 −8 src/saber/fastlam/LayerSpec.h
+0 −2 src/saber/generic/VertLoc.cc
+0 −8 src/saber/interpolation/Rescaling.cc
+0 −1 src/saber/spectralb/CovarianceStatisticsUtils.cc
+22 −22 src/saber/vader/VaderBlock.cc
2 changes: 1 addition & 1 deletion sorc/soca
Open in desktop
Submodule soca updated 2 files
+5 −0 src/soca/Increment/Increment.cc
+1 −0 src/soca/Increment/Increment.h
2 changes: 1 addition & 1 deletion sorc/ufo
Open in desktop
Submodule ufo updated 8 files
+193 −0 src/ufo/filters/AverageObsToGeoValLevels.cc
+98 −0 src/ufo/filters/AverageObsToGeoValLevels.h
+2 −0 src/ufo/filters/CMakeLists.txt
+3 −0 src/ufo/instantiateObsFilterFactory.h
+14 −16 src/ufo/operators/crtm/ufo_crtm_active_mod.F90
+28 −6 src/ufo/operators/crtm/ufo_crtm_utils_mod.F90
+1 −0 src/ufo/operators/crtm/ufo_radiancecrtm_mod.F90
+16 −6 test/testinput/instrumentTests/cpr/cpr_cloudsat_gfs_HofX.yaml
2 changes: 1 addition & 1 deletion sorc/vader
Open in desktop
Submodule vader updated 58 files
+6 −0 src/vader/RecipeBase.h
+1 −0 src/vader/recipes/AirDensityLevelsMinusOne.h
+9 −0 src/vader/recipes/AirDensityLevelsMinusOne_A.cc
+1 −0 src/vader/recipes/AirTemperature.h
+9 −4 src/vader/recipes/AirTemperature_A.cc
+1 −0 src/vader/recipes/AirVirtualTemperature.h
+6 −0 src/vader/recipes/AirVirtualTemperature_A.cc
+1 −0 src/vader/recipes/CloudIceMixingRatio.h
+6 −0 src/vader/recipes/CloudIceMixingRatio_A.cc
+1 −0 src/vader/recipes/CloudLiquidMixingRatio.h
+6 −0 src/vader/recipes/CloudLiquidMixingRatio_A.cc
+1 −0 src/vader/recipes/DryAirDensityLevelsMinusOne.h
+12 −0 src/vader/recipes/DryAirDensityLevelsMinusOne_A.cc
+1 −0 src/vader/recipes/EastwardWindAt10m.h
+5 −0 src/vader/recipes/EastwardWindAt10m_A.cc
+1 −0 src/vader/recipes/HydrostaticExnerLevels.h
+8 −0 src/vader/recipes/HydrostaticExnerLevels_A.cc
+1 −0 src/vader/recipes/NorthwardWindAt10m.h
+5 −0 src/vader/recipes/NorthwardWindAt10m_A.cc
+2 −0 src/vader/recipes/ParticulateMatter2p5.h
+9 −0 src/vader/recipes/ParticulateMatter2p5_A.cc
+5 −0 src/vader/recipes/ParticulateMatter2p5_B.cc
+1 −0 src/vader/recipes/RainMixingRatio.h
+6 −0 src/vader/recipes/RainMixingRatio_A.cc
+36 −0 src/vader/recipes/TestRecipes.cc
+50 −8 src/vader/recipes/TestRecipes.h
+1 −0 src/vader/recipes/TotalMixingRatio.h
+5 −0 src/vader/recipes/TotalMixingRatio_A.cc
+1 −0 src/vader/recipes/TotalWater.h
+5 −0 src/vader/recipes/TotalWater_A.cc
+2 −0 src/vader/recipes/VirtualPotentialTemperature.h
+6 −0 src/vader/recipes/VirtualPotentialTemperature_A.cc
+6 −0 src/vader/recipes/VirtualPotentialTemperature_B.cc
+1 −0 src/vader/recipes/WaterVaporMixingRatioWrtMoistAirAndCondensedWater.h
+1 −0 src/vader/recipes/WaterVaporMixingRatioWrtMoistAirAndCondensedWater2m.h
+5 −0 src/vader/recipes/WaterVaporMixingRatioWrtMoistAirAndCondensedWater2m_A.cc
+6 −0 src/vader/recipes/WaterVaporMixingRatioWrtMoistAirAndCondensedWater_A.cc
+304 −164 src/vader/vader.cc
+33 −7 src/vader/vader.h
+71 −0 test/testinput/planvariable.yaml
+6 −1 test/testinput/vader_AirTemperature_A.yaml
+3 −0 test/testinput/vader_CloudIceMixingRatio_A.yaml
+3 −0 test/testinput/vader_CloudLiquidMixingRatio_A.yaml
+17 −3 test/testinput/vader_DryAirDensityLevelsMinusOne_A.yaml
+9 −1 test/testinput/vader_HydrostaticExnerLevels_A.yaml
+5 −0 test/testinput/vader_ParticulateMatter2p5_A.yaml
+6 −1 test/testinput/vader_ParticulateMatter2p5_B.yaml
+3 −0 test/testinput/vader_RainMixingRatio_A.yaml
+1 −0 test/testinput/vader_TotalMixingRatio_A.yaml
+1 −0 test/testinput/vader_TotalWater_A.yaml
+6 −1 test/testinput/vader_VirtualPotentialTemperature_A.yaml
+6 −1 test/testinput/vader_VirtualPotentialTemperature_B.yaml
+1 −0 test/testinput/vader_WaterVaporMixingRatioWrtMoistAirAndCondensedWater2m_A.yaml
+3 −0 test/testinput/vader_WaterVaporMixingRatioWrtMoistAirAndCondensedWater_A.yaml
+1 −0 test/testinput/vader_uwind_at_10m_A.yaml
+1 −0 test/testinput/vader_vwind_at_10m_A.yaml
+54 −14 test/vader/PlanVariable.h
+44 −18 test/vader/Vader.h
2 changes: 2 additions & 0 deletions test/atm/global-workflow/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ base:
STMP: "@bindir@/test/atm/global-workflow/testrun"
PTMP: "@bindir@/test/atm/global-workflow/testrun"
DO_TEST_MODE: "YES"
FHMAX_GFS: 24
FHMAX_HF_GFS: 0

atmanl:
JCB_ALGO_YAML_VAR: "@srcdir@/test/atm/global-workflow/jcb-prototype_3dvar.yaml.j2"
Expand Down
1 change: 1 addition & 0 deletions test/atm/global-workflow/jjob_ens_init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export ACCOUNT=da-cpu
export COM_TOP=$ROTDIR

# Set GFS COM paths
export STRICT="NO"
source "${HOMEgfs}/ush/preamble.sh"
source "${HOMEgfs}/parm/config/gfs/config.com"

Expand Down
1 change: 1 addition & 0 deletions test/atm/global-workflow/jjob_ens_init_split.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export ACCOUNT=da-cpu
export COM_TOP=$ROTDIR

# Set GFS COM paths
export STRICT="NO"
source "${HOMEgfs}/ush/preamble.sh"
source "${HOMEgfs}/parm/config/gfs/config.com"

Expand Down
2 changes: 1 addition & 1 deletion test/atm/global-workflow/jjob_ens_obs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ cp $EXPDIR/config.base_lobsdiag_forenkf_true $EXPDIR/config.base

# Execute j-job
if [[ $machine = 'HERA' || $machine = 'ORION' || $machine = 'HERCULES' ]]; then
sbatch --nodes=1 --ntasks=36 --account=$ACCOUNT --qos=debug --time=00:30:00 --export=ALL --wait --output=atmensanlobs-%j.out ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_OBS
sbatch --nodes=1 --ntasks=36 --account=$ACCOUNT --qos=batch --time=00:30:00 --export=ALL --wait --output=atmensanlobs-%j.out ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_OBS
else
${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_OBS
fi
2 changes: 1 addition & 1 deletion test/atm/global-workflow/jjob_ens_sol.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ cp $EXPDIR/config.base_lobsdiag_forenkf_true $EXPDIR/config.base

# Execute j-job
if [[ $machine = 'HERA' || $machine = 'ORION' || $machine = 'HERCULES' ]]; then
sbatch --nodes=1 --ntasks=36 --account=$ACCOUNT --qos=debug --time=00:30:00 --export=ALL --wait --output=atmensanlsol-%j.out ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_SOL
sbatch --nodes=1 --ntasks=36 --account=$ACCOUNT --qos=batch --time=00:30:00 --export=ALL --wait --output=atmensanlsol-%j.out ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_SOL
else
${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_SOL
fi
1 change: 1 addition & 0 deletions test/atm/global-workflow/jjob_var_init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export ACCOUNT=da-cpu
export COM_TOP=$ROTDIR

# Set GFS COM paths
export STRICT="NO"
source "${HOMEgfs}/ush/preamble.sh"
source "${HOMEgfs}/parm/config/gfs/config.com"

Expand Down