Skip to content

Commit

Permalink
update jedi hashes and associated changes
Browse files Browse the repository at this point in the history
  • Loading branch information
RussTreadon-NOAA committed Dec 17, 2024
1 parent a44e879 commit 875a833
Show file tree
Hide file tree
Showing 30 changed files with 281 additions and 285 deletions.
38 changes: 19 additions & 19 deletions parm/aero/berror/aero_diagb.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -76,25 +76,25 @@ variables:
- mass_fraction_of_sea_salt003_in_air
- mass_fraction_of_sea_salt004_in_air

global rescale:
geometry:
fms initialization:
namelist filename: ./fv3jedi/fmsmpp.nml
field table filename: ./fv3jedi/field_table
akbk: ./fv3jedi/akbk.nc4
layout:
- {{ layout_x }}
- {{ layout_y }}
npx: {{ npx_rescale }}
npy: {{ npy_rescale }}
npz: {{ npz_ges }}
field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
rescale stddev:
filetype: fms restart
skip coupler file: true
dateapath: ./stddev
filename_trcr: rescale.fv_tracer.res.nc
filename_cplr: rescale.coupler.res
##global rescale:
## geometry:
## fms initialization:
## namelist filename: ./fv3jedi/fmsmpp.nml
## field table filename: ./fv3jedi/field_table
## akbk: ./fv3jedi/akbk.nc4
## layout:
## - {{ layout_x }}
## - {{ layout_y }}
## npx: {{ npx_rescale }}
## npy: {{ npy_rescale }}
## npz: {{ npz_ges }}
## field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
## rescale stddev:
## filetype: fms restart
## skip coupler file: true
## dateapath: ./stddev
## filename_trcr: rescale.fv_tracer.res.nc
## filename_cplr: rescale.coupler.res

number of halo points: {{ aero_diagb_n_halo }}
number of neighbors: {{ aero_diagb_n_neighbors }}
Expand Down
16 changes: 6 additions & 10 deletions parm/io/fv3jedi_fieldmetadata_history.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,6 @@ field metadata:
- long name: v_component_of_native_D_grid_wind
io name: vd

- long name: stc
io name: soilt

- long name: soilMoistureVolumetric
io name: soilw

# Dummy IO name since stc and soilt are different in JEDI but same in UFS
- long name: soilt
io name: dummy_io_name

- long name: slmsk
io name: land

Expand All @@ -91,3 +81,9 @@ field metadata:

- long name: northward_wind_at_surface
io name: vgrd_hyblev1

- long name: soilm
io name: soilw1

- long name: soilt
io name: soilt1
2 changes: 1 addition & 1 deletion sorc/da-utils
2 changes: 1 addition & 1 deletion sorc/oops
Submodule oops updated 71 files
+4 −0 CMakeLists.txt
+6 −8 l95/src/lorenz95/TLML95.cc
+2 −0 l95/src/lorenz95/TLML95.h
+2 −0 l95/test/testinput/4dvar_drplanclmp.yaml
+15 −15 l95/test/testoutput/4dvar_drplanclmp.test
+0 −19 qg/mains/CMakeLists.txt
+7 −12 qg/model/TlmQG.cc
+2 −0 qg/model/TlmQG.h
+1 −0 qg/test/testinput/4dvar_drpcg_lmp.yaml
+1 −0 qg/test/testinput/4dvar_rpcg.yaml
+23 −23 qg/test/testoutput/4dvar_drpcg_lmp.test
+20 −20 qg/test/testoutput/4dvar_rpcg.test
+36 −78 src/CMakeLists.txt
+9 −1 src/oops/assimilation/DRGMRESRMinimizer.h
+5 −2 src/oops/assimilation/DRIPCGMinimizer.h
+26 −18 src/oops/assimilation/DRPBlockLanczosMinimizer.h
+6 −0 src/oops/assimilation/DRPCGMinimizer.h
+8 −1 src/oops/assimilation/DRPFOMMinimizer.h
+2 −1 src/oops/assimilation/DRPLanczosMinimizer.h
+11 −4 src/oops/assimilation/FGMRES.h
+10 −3 src/oops/assimilation/FullGMRES.h
+6 −3 src/oops/assimilation/GMRESR.h
+10 −3 src/oops/assimilation/IPCG.h
+10 −3 src/oops/assimilation/MINRES.h
+11 −4 src/oops/assimilation/PCG.h
+11 −4 src/oops/assimilation/PLanczos.h
+10 −1 src/oops/assimilation/RPCGMinimizer.h
+5 −2 src/oops/assimilation/RPLanczosMinimizer.h
+1 −0 src/oops/base/LinearModel.h
+4 −0 src/oops/base/PostBaseTLAD.h
+8 −0 src/oops/base/PostProcessorTLAD.h
+13 −5 src/oops/base/TrajectorySaver.h
+0 −12 src/oops/generic/AtlasInterpolator.cc
+6 −0 src/oops/generic/HybridLinearModel.h
+1 −0 src/oops/generic/IdentityLinearModel.h
+1 −0 src/oops/generic/LinearModelBase.h
+1 −0 src/oops/generic/PseudoLinearModelIncrement4D.h
+1 −0 src/oops/generic/SimpleLinearModel.h
+1 −12 src/oops/runs/AddIncrement.h
+1 −5 src/oops/runs/AdjointForecast.h
+0 −39 src/oops/runs/Application.cc
+1 −9 src/oops/runs/Application.h
+1 −8 src/oops/runs/ControlPert.h
+2 −13 src/oops/runs/ConvertIncrement.h
+2 −13 src/oops/runs/ConvertState.h
+1 −12 src/oops/runs/ConvertToStructuredGrid.h
+1 −12 src/oops/runs/DiffStates.h
+2 −13 src/oops/runs/EnsMeanAndVariance.h
+1 −12 src/oops/runs/EnsRecenter.h
+2 −21 src/oops/runs/EnsembleApplication.h
+4 −24 src/oops/runs/EnsembleGETKFApplication.h
+1 −13 src/oops/runs/EnsembleInflation.h
+4 −44 src/oops/runs/ExternalDFI.h
+1 −5 src/oops/runs/Forecast.h
+1 −12 src/oops/runs/GenEnsPertB.h
+1 −11 src/oops/runs/GenHybridLinearModelCoeffs.h
+3 −49 src/oops/runs/HofX3D.h
+3 −63 src/oops/runs/HofX4D.h
+1 −12 src/oops/runs/HybridGain.h
+1 −5 src/oops/runs/LinearizationError.h
+1 −13 src/oops/runs/LocalEnsembleDA.h
+1 −13 src/oops/runs/RescaleEnsPerts.h
+25 −53 src/oops/runs/Run.cc
+0 −3 src/oops/runs/Run.h
+1 −12 src/oops/runs/SqrtOfVertLoc.h
+2 −46 src/oops/runs/TemplatedEnsembleApplication.h
+2 −2 src/oops/runs/Test.h
+1 −7 src/oops/runs/Variational.h
+8 −4 src/oops/util/FieldSetHelpers.cc
+1 −10 src/test/base/DummyRun.cc
+2 −2 src/test/interface/LinearModel.h
2 changes: 1 addition & 1 deletion sorc/ufo
Submodule ufo updated 42 files
+1 −2 src/mains/ObsErrorWithinGroupCovDiags.h
+1 −1 src/mains/RunCRTM.h
+4 −0 src/ufo/filters/CMakeLists.txt
+18 −0 src/ufo/filters/GeoVaLsWriter.cc
+3 −2 src/ufo/filters/GeoVaLsWriter.h
+121 −0 src/ufo/filters/ParameterSubstitution.cc
+136 −0 src/ufo/filters/ParameterSubstitution.h
+16 −1 src/ufo/filters/SuperOb.cc
+5 −0 src/ufo/filters/gnssroonedvarcheck/GNSSROOneDVarCheck.cc
+31 −3 src/ufo/filters/obsfunctions/HydrometeorCheckAMSUA.cc
+4 −1 src/ufo/filters/obsfunctions/HydrometeorCheckAMSUA.h
+31 −2 src/ufo/filters/obsfunctions/HydrometeorCheckATMS.cc
+4 −1 src/ufo/filters/obsfunctions/HydrometeorCheckATMS.h
+84 −0 src/ufo/filters/obsfunctions/MPIRank.cc
+58 −0 src/ufo/filters/obsfunctions/MPIRank.h
+6 −2 src/ufo/filters/obsfunctions/ObsErrorBoundMW.cc
+5 −1 src/ufo/filters/obsfunctions/ObsErrorBoundMW.h
+1 −8 src/ufo/filters/rttovonedvarcheck/RTTOVOneDVarCheck.cc
+8 −0 src/ufo/filters/rttovonedvarcheck/ufo_rttovonedvarcheck_mod.f90
+3 −0 src/ufo/instantiateObsFilterFactory.h
+10 −2 src/ufo/operators/rttov/ObsRadianceRTTOV.cc
+7 −0 src/ufo/operators/rttov/ObsRadianceRTTOVParameters.h
+0 −3 src/ufo/operators/rttov/ObsRadianceRTTOVTLAD.cc
+8 −5 src/ufo/operators/rttov/ufo_radiancerttov_mod.F90
+8 −6 src/ufo/operators/rttov/ufo_radiancerttov_tlad_mod.F90
+29 −5 src/ufo/operators/rttov/ufo_radiancerttov_utils_mod.F90
+1 −1 src/ufo/operators/vertinterp/ufo_vertinterp_mod.F90
+4 −2 src/ufo/operators/vertinterp/ufo_vertinterp_tlad_mod.F90
+2 −0 src/ufo/superob/CMakeLists.txt
+11 −2 src/ufo/superob/SuperObBase.cc
+8 −0 src/ufo/superob/SuperObBase.h
+58 −0 src/ufo/superob/SuperObMeanO.cc
+49 −0 src/ufo/superob/SuperObMeanO.h
+11 −1 test/testinput/unit_tests/filters/CMakeLists.txt
+92 −0 test/testinput/unit_tests/filters/iasi_rttov_ops_qc_rttovonedvarcheck.yaml
+20 −0 test/testinput/unit_tests/filters/obsfunctions/CMakeLists.txt
+97 −0 test/testinput/unit_tests/filters/obsfunctions/function_mpirank_2pe.yaml
+97 −0 test/testinput/unit_tests/filters/obsfunctions/function_mpirank_3pe.yaml
+203 −0 test/testinput/unit_tests/filters/parameter_substitution.yaml
+2 −0 test/testinput/unit_tests/filters/print_filter_data.yaml
+38 −3 test/testinput/unit_tests/filters/superob.yaml
+1 −0 test/testinput/unit_tests/operators/iasi_rttov_ops.yaml
34 changes: 17 additions & 17 deletions test/testreference/C96C48_ufs_hybatmDA_3dvar-fv3inc.ref
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,26 @@ JEDI Increment:

----------------------------------------------------------------------------------------------------
Increment print | number of fields = 8 | cube sphere face size: C48
eastward_wind | Min:-2.1094110991271009e-07 Max:+1.1717330217209110e-07 RMS:+1.8406442199343545e-09
northward_wind | Min:-1.0218003509976370e-07 Max:+2.6284932985731757e-07 RMS:+1.8321568102519878e-09
air_temperature | Min:-5.2967720876040403e-08 Max:+6.6442652268960956e-08 RMS:+7.1529564595995224e-10
air_pressure_at_surface | Min:-2.0471925381571054e-06 Max:+9.5464929472655058e-07 RMS:+4.2656890498660969e-08
water_vapor_mixing_ratio_wrt_moist_air | Min:-3.5909499332409389e-11 Max:+2.5060615908845119e-11 RMS:+2.7346125979528040e-13
cloud_liquid_ice | Min:-5.5298263899525562e-13 Max:+3.6544474506536037e-13 RMS:+3.3630266932071384e-15
cloud_liquid_water | Min:-1.0711521106947577e-11 Max:+3.1052085273756969e-12 RMS:+1.7896344450957455e-14
ozone_mass_mixing_ratio | Min:-1.0347839576407838e-06 Max:+1.3449736530190683e-06 RMS:+3.6860537521399650e-08
eastward_wind | Min:-2.1094110991271009e-07 Max:+1.1717330217209110e-07 RMS:+1.8406454262511763e-09
northward_wind | Min:-1.0218003509976370e-07 Max:+2.6284932985731757e-07 RMS:+1.8321580793695034e-09
air_temperature | Min:-5.2967720876040403e-08 Max:+6.6442652268960956e-08 RMS:+7.1529606676243097e-10
air_pressure_at_surface | Min:-2.0471925381571054e-06 Max:+9.5464929472655058e-07 RMS:+4.2658503304032433e-08
water_vapor_mixing_ratio_wrt_moist_air | Min:-3.5909499332409389e-11 Max:+2.5060615908845119e-11 RMS:+2.7346183757612028e-13
cloud_liquid_ice | Min:-5.5298263899525562e-13 Max:+3.6544474506536037e-13 RMS:+3.3630267261933008e-15
cloud_liquid_water | Min:-1.0711521106947577e-11 Max:+3.1052085273756969e-12 RMS:+1.7896345144255639e-14
ozone_mass_mixing_ratio | Min:-1.0347839576442363e-06 Max:+1.3449736530234745e-06 RMS:+3.6860537521507223e-08
----------------------------------------------------------------------------------------------------
FV3 Increment:

----------------------------------------------------------------------------------------------------
Increment print | number of fields = 9 | cube sphere face size: C48
eastward_wind | Min:-2.1094110991271009e-07 Max:+1.1717330217209110e-07 RMS:+1.8406442199343545e-09
northward_wind | Min:-1.0218003509976370e-07 Max:+2.6284932985731757e-07 RMS:+1.8321568102519878e-09
air_temperature | Min:-5.2967720876040403e-08 Max:+6.6442652268960956e-08 RMS:+7.1529564595995224e-10
water_vapor_mixing_ratio_wrt_moist_air | Min:-3.5909499332409389e-11 Max:+2.5060615908845119e-11 RMS:+2.7346125979528040e-13
cloud_liquid_ice | Min:-5.5298263899525562e-13 Max:+3.6544474506536037e-13 RMS:+3.3630266932071384e-15
cloud_liquid_water | Min:-1.0711521106947577e-11 Max:+3.1052085273756969e-12 RMS:+1.7896344450957455e-14
ozone_mass_mixing_ratio | Min:-1.0347839576407838e-06 Max:+1.3449736530190683e-06 RMS:+3.6860537521399650e-08
air_pressure_thickness | Min:-3.8967755244811997e-08 Max:+1.7229922377737239e-08 RMS:+4.3178264898018102e-10
layer_thickness | Min:-1.9750632418435998e-07 Max:+1.8317587091587484e-07 RMS:+3.6300478031517017e-09
eastward_wind | Min:-2.1094110991271009e-07 Max:+1.1717330217209110e-07 RMS:+1.8406454262511763e-09
northward_wind | Min:-1.0218003509976370e-07 Max:+2.6284932985731757e-07 RMS:+1.8321580793695034e-09
air_temperature | Min:-5.2967720876040403e-08 Max:+6.6442652268960956e-08 RMS:+7.1529606676243097e-10
water_vapor_mixing_ratio_wrt_moist_air | Min:-3.5909499332409389e-11 Max:+2.5060615908845119e-11 RMS:+2.7346183757612028e-13
cloud_liquid_ice | Min:-5.5298263899525562e-13 Max:+3.6544474506536037e-13 RMS:+3.3630267261933008e-15
cloud_liquid_water | Min:-1.0711521106947577e-11 Max:+3.1052085273756969e-12 RMS:+1.7896345144255639e-14
ozone_mass_mixing_ratio | Min:-1.0347839576442363e-06 Max:+1.3449736530234745e-06 RMS:+3.6860537521507223e-08
air_pressure_thickness | Min:-3.8967755244811997e-08 Max:+1.7229922377737239e-08 RMS:+4.3180294207593410e-10
layer_thickness | Min:-1.9750632418435998e-07 Max:+1.8317587091587484e-07 RMS:+3.6300476680474795e-09
----------------------------------------------------------------------------------------------------
Loading

0 comments on commit 875a833

Please sign in to comment.