Skip to content
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.

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

Update JEDI hashes (20250203) #1475

Draft
wants to merge 25 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
7e6f070
Update to new stable build on 20250130
RussTreadon-NOAA Jan 30, 2025
48c2244
Update to new stable build on 20250131
RussTreadon-NOAA Jan 31, 2025
cefa887
Merge branch 'develop' into feature/stable-nightly
RussTreadon-NOAA Jan 31, 2025
e6eafb0
Update to new stable build on 20250201
RussTreadon-NOAA Feb 1, 2025
f7d9c7d
Update to new stable build on 20250204
RussTreadon-NOAA Feb 4, 2025
bd9aedf
Merge branch 'develop' into feature/stable-nightly
RussTreadon-NOAA Feb 5, 2025
b0e8f3f
Update to new stable build on 20250205
RussTreadon-NOAA Feb 5, 2025
68f12a2
Merge branch 'develop' into feature/stable-nightly
RussTreadon-NOAA Feb 6, 2025
f9c7132
Update to new stable build on 20250207
RussTreadon-NOAA Feb 7, 2025
47db112
Merge branch 'develop' into feature/stable-nightly
RussTreadon-NOAA Feb 8, 2025
c306748
Update to new stable build on 20250211
RussTreadon-NOAA Feb 11, 2025
ea2ef17
update externals when updating JEDI hashes (#1495)
RussTreadon-NOAA Feb 13, 2025
b2c6d9b
Update to new stable build on 20250213
RussTreadon-NOAA Feb 13, 2025
5d24a63
Merge branch 'develop' into feature/stable-nightly
RussTreadon-NOAA Feb 14, 2025
9443549
Merge branch 'develop' into feature/stable-nightly
RussTreadon-NOAA Feb 15, 2025
ce071de
Update to new stable build on 20250215
RussTreadon-NOAA Feb 15, 2025
0c143e0
Update to new stable build on 20250219
RussTreadon-NOAA Feb 19, 2025
264845d
Merge branch 'develop' into feature/stable-nightly
RussTreadon-NOAA Feb 20, 2025
d1a30f9
Update to new stable build on 20250220
RussTreadon-NOAA Feb 20, 2025
0e14931
Merge branch 'develop' into feature/stable-nightly
RussTreadon-NOAA Feb 20, 2025
bf011d5
Update to soca changes that significantly improve memory/runtime
Feb 20, 2025
800ed1d
Merge branch 'feature/update_for_soca' into feature/stable-nightly (#…
RussTreadon-NOAA Feb 21, 2025
bba397d
revert sorc/soca back to hash 6ca1631
RussTreadon-NOAA Feb 21, 2025
c1e5feb
Merge branch 'develop' into feature/stable-nightly
RussTreadon-NOAA Feb 21, 2025
523b97b
Update to new stable build on 20250221
RussTreadon-NOAA Feb 21, 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
6 changes: 0 additions & 6 deletions parm/io/fv3jedi_fieldmetadata_history.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,6 @@ field metadata:
- long name: geopotential_height_at_surface
io name: hgtsfc

- long name: u_component_of_native_D_grid_wind
io name: ud

- long name: v_component_of_native_D_grid_wind
io name: vd

- long name: slmsk
io name: land

Expand Down
6 changes: 0 additions & 6 deletions parm/io/fv3jedi_fieldmetadata_restart.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
field metadata:

- long name: u_component_of_native_D_grid_wind
io name: u

- long name: v_component_of_native_D_grid_wind
io name: v

- long name: air_temperature
io name: T

Expand Down
2 changes: 1 addition & 1 deletion sorc/fv3-jedi
Submodule fv3-jedi updated 221 files
2 changes: 1 addition & 1 deletion sorc/oops
Submodule oops updated 62 files
+1 −1 l95/src/lorenz95/ModelBias.cc
+1 −1 l95/src/lorenz95/ObsBias.cc
+21 −15 l95/src/lorenz95/ObsVec1D.cc
+5 −3 l95/src/lorenz95/ObsVec1D.h
+5 −0 l95/src/lorenz95/StateL95.h
+14 −0 l95/test/CMakeLists.txt
+66 −0 l95/test/testinput/getkf_perturbed_linearobserver.yaml
+90 −0 l95/test/testinput/letkf_perturbed_linearobserver.yaml
+65 −0 l95/test/testoutput/getkf_perturbed_linearobserver.test
+74 −0 l95/test/testoutput/letkf_perturbed_linearobserver.test
+1 −1 qg/model/ObsBias.cc
+7 −0 qg/model/ObsSpaceQG.cc
+2 −1 qg/model/ObsSpaceQG.h
+31 −12 qg/model/ObsVecQG.cc
+6 −3 qg/model/ObsVecQG.h
+1 −0 qg/model/QgFortran.h
+5 −0 qg/model/StateQG.h
+23 −0 qg/model/qg_obsdb_interface.F90
+26 −1 qg/model/qg_obsdb_mod.F90
+3 −0 src/CMakeLists.txt
+2 −2 src/oops/assimilation/ControlVariable.h
+4 −12 src/oops/assimilation/CostJo.h
+18 −19 src/oops/assimilation/GETKFSolver.h
+229 −0 src/oops/assimilation/GETKFSolverPert.h
+16 −16 src/oops/assimilation/LETKFSolver.h
+7 −6 src/oops/assimilation/LETKFSolverGSI.h
+216 −0 src/oops/assimilation/LETKFSolverPert.h
+19 −15 src/oops/assimilation/LocalEnsembleSolver.h
+6 −0 src/oops/assimilation/instantiateLocalEnsembleSolverFactory.h
+39 −23 src/oops/base/Departures.h
+5 −4 src/oops/base/DeparturesEnsemble.h
+59 −3 src/oops/base/FieldSet3D.cc
+6 −6 src/oops/base/IncrementEnsemble4D.h
+1 −1 src/oops/base/Model.h
+1 −1 src/oops/base/ObsAuxControls.h
+20 −6 src/oops/base/ObsSpaces.h
+26 −1 src/oops/base/Observations.h
+0 −1 src/oops/base/State.h
+102 −34 src/oops/base/StateEnsemble4D.h
+76 −5 src/oops/base/StateSet.h
+14 −12 src/oops/base/StateSetSaver.h
+5 −5 src/oops/generic/PseudoModelState4D.h
+1 −0 src/oops/interface/ObsSpace.h
+34 −23 src/oops/interface/ObsVector.h
+16 −1 src/oops/interface/State.h
+1 −1 src/oops/runs/EnsembleGETKFApplication.h
+20 −9 src/oops/runs/HofX3D.h
+19 −9 src/oops/runs/HofX4D.h
+181 −13 src/oops/runs/LocalEnsembleDA.h
+61 −0 src/oops/util/DateTime.cc
+7 −0 src/oops/util/DateTime.h
+5 −1 src/oops/util/LibOOPS.cc
+2 −0 src/oops/util/LibOOPS.h
+9 −0 src/oops/util/datetime.intfb.h
+12 −0 src/oops/util/datetime_f.cc
+2 −0 src/oops/util/datetime_f.h
+26 −1 src/oops/util/datetime_mod.F90
+24 −19 src/oops/util/parameters/Parameters.cc
+3 −2 src/test/base/ObsErrorCovariance.h
+5 −11 src/test/interface/ObsVector.h
+13 −3 src/test/util/DateTime.cc
+22 −2 src/test/util/datetime.F90
2 changes: 1 addition & 1 deletion sorc/saber
Submodule saber updated 182 files
2 changes: 1 addition & 1 deletion sorc/soca
Submodule soca updated 36 files
+1 −1 external/icepack/Icepack
+21 −13 src/soca/AnalyticInit/soca_analytic_mod.F90
+27 −19 src/soca/Fields/Fields.cc
+1 −2 src/soca/Fields/Fields.h
+390 −752 src/soca/Fields/soca_fields_mod.F90
+17 −2 src/soca/Geometry/soca_geom_mod.F90
+59 −34 src/soca/Increment/Increment.cc
+1 −0 src/soca/Increment/Increment.h
+0 −1 src/soca/Increment/IncrementFortran.h
+0 −28 src/soca/Increment/soca_increment.interface.F90
+124 −87 src/soca/Increment/soca_increment_mod.F90
+8 −20 src/soca/LinearVariableChange/Balance/soca_balance_mod.F90
+4 −0 src/soca/LinearVariableChange/LinearModel2GeoVaLs/LinearModel2GeoVaLs.cc
+6 −3 src/soca/SaberBlocks/BkgErrFilt/BkgErrFilt.cc
+120 −16 src/soca/State/State.cc
+4 −0 src/soca/State/State.h
+0 −9 src/soca/State/StateFortran.h
+0 −103 src/soca/State/soca_state.interface.F90
+0 −137 src/soca/State/soca_state_mod.F90
+9 −4 src/soca/VariableChange/Model2GeoVaLs/Model2GeoVaLs.F90
+0 −2 src/soca/VariableChange/Soca2Cice/Soca2Cice.F90
+3 −1 src/soca/VariableChange/Soca2Cice/Soca2Cice.cc
+2 −3 src/soca/VariableChange/Soca2Cice/soca_ciceutils_mod.F90
+120 −86 src/soca/VariableChange/Soca2Cice/soca_soca2cice_mod.F90
+2 −1 src/soca/VariableChange/VariableChange.cc
+1 −9 test/CMakeLists.txt
+7 −4 test/testinput/3dhybfgat_pseudo.yml
+7 −4 test/testinput/4dvar_htlm.yml
+7 −4 test/testinput/4dvar_identity.yml
+0 −60 test/testinput/hofx_oasim_3d.yml
+7 −4 test/testinput/varchange_balance.yml
+7 −4 test/testinput/varchange_balance_TSSSH.yml
+12 −12 test/testref/3dhybfgat_pseudo.test
+7 −7 test/testref/4dvar_htlm.test
+2 −2 test/testref/4dvar_identity.test
+0 −26 test/testref/hofx_oasim_3d.test
2 changes: 1 addition & 1 deletion sorc/ufo
Submodule ufo updated 38 files
+12 −0 src/ufo/GeoVaLs.cc
+1 −1 src/ufo/ObsBias.cc
+3 −3 src/ufo/ObsFilters.cc
+1 −1 src/ufo/ObsFilters.h
+73 −1 src/ufo/filters/ConventionalProfileProcessing.cc
+27 −0 src/ufo/filters/ConventionalProfileProcessing.h
+22 −2 src/ufo/filters/ProcessAMVQI.cc
+13 −6 src/ufo/filters/obsfunctions/CloudFirstGuessMinimumResidual.cc
+1 −1 src/ufo/filters/obsfunctions/CloudFirstGuessMinimumResidual.h
+6 −0 src/ufo/operators/columnretrieval/ObsColumnRetrievalParameters.h
+5 −2 src/ufo/operators/columnretrieval/ufo_columnretrieval_mod.F90
+7 −3 src/ufo/operators/columnretrieval/ufo_columnretrieval_tlad_mod.F90
+34 −11 src/ufo/operators/columnretrieval/ufo_satcolumn_mod.F90
+4 −4 src/ufo/operators/crtm/ufo_crtm_active_mod.F90
+4 −4 src/ufo/operators/crtm/ufo_crtm_passive_mod.F90
+5 −5 src/ufo/operators/groundgnss/ZenithTotalDelayROPP/CMakeLists.txt
+15 −17 src/ufo/operators/rttov/ufo_radiancerttov_utils_mod.F90
+0 −5 src/ufo/operators/scatwind/NeutralMetOffice/ufo_scatwind_neutralmetoffice_mod.F90
+0 −6 src/ufo/operators/scatwind/NeutralMetOffice/ufo_scatwind_neutralmetoffice_tlad_mod.F90
+0 −3 src/ufo/profile/EntireSampleDataHandler.h
+24 −7 src/ufo/profile/ProfileAveragePressure.cc
+20 −4 src/ufo/profile/ProfileAverageRelativeHumidity.cc
+26 −11 src/ufo/profile/ProfileAverageTemperature.cc
+25 −10 src/ufo/profile/ProfileAverageWindSpeed.cc
+1 −1 src/ufo/profile/ProfileCheckBackgroundGeopotentialHeight.cc
+5 −2 src/ufo/profile/ProfileChecker.cc
+6 −2 src/ufo/profile/ProfileChecker.h
+2 −2 test/CMakeLists.txt
+2 −1 test/testinput/instrumentTests/tempo/tempo_no2.yaml
+1 −1 test/testinput/unit_tests/filters/CMakeLists.txt
+8 −0 test/testinput/unit_tests/filters/iasi_rttov_ops_qc_rttovonedvarcheck.yaml
+37 −0 test/testinput/unit_tests/filters/qc_processamvqi.yaml
+0 −14 test/testinput/unit_tests/operators/scatwind_neutral_metoffice.yaml
+20 −0 test/testinput/unit_tests/profile/CMakeLists.txt
+106 −0 .../testinput/unit_tests/profile/conventionalprofileprocessing_average_single_level_profile_MPI_obsfilter.yaml
+40 −0 test/testinput/unit_tests/profile/conventionalprofileprocessing_fewerobsthanranks.yaml
+2 −0 test/testinput/unit_tests/variabletransforms/CMakeLists.txt
+3 −2 test/ufo/Reconditioning.h
3 changes: 3 additions & 0 deletions ush/submodules/update_develop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,7 @@ for r in $repos; do
echo "Updating ${gdasdir}/sorc/${r}"
cd ${gdasdir}/sorc
git submodule update --remote --merge ${r}
cd ${gdasdir}/sorc/${r}
git submodule update --init --recursive
done
cd ${gdasdir}
7 changes: 3 additions & 4 deletions utils/soca/gdas_ens_handler.h
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,7 @@ namespace gdasapp {

// Save total ssh
oops::Log::info() << "ssh ensemble member " << i << std::endl;
soca::Increment ssh_tmp(geomOut, socaSshVar, postProcIncr.dt_);
ssh_tmp = ensMembers[i];
soca::Increment ssh_tmp(socaSshVar, ensMembers[i]);
sshTotal.push_back(ssh_tmp);

// Zero out ssh and other specified fields
Expand All @@ -258,8 +257,8 @@ namespace gdasapp {
// Compute the original steric height perturbation from T and S
eckit::LocalConfiguration stericConfig(fullConfig, "steric height");
postProcIncr.applyLinVarChange(incr, stericConfig, ensMeanTraj);
ssh_tmp = incr;
sshSteric.push_back(ssh_tmp);
soca::Increment ssh_tmp2(socaSshVar, incr);
sshSteric.push_back(ssh_tmp2);

// Compute unbalanced ssh
ssh_tmp = sshTotal[i];
Expand Down