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.

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

Jump to bottom

Change hydrostatic_delz to delz #1284

Merged
merged 9 commits into from
Sep 25, 2024
Merged

Change hydrostatic_delz to delz #1284

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ff57aac
Initial commit
DavidNew-NOAA Sep 17, 2024
3dc83d3
Update fields metadata override for FV3 increment and fv3inc test inp…
DavidNew-NOAA Sep 17, 2024
84b16c2
Update JCB-GDAS and FV3-JEDI hashes
DavidNew-NOAA Sep 17, 2024
a6bbe30
Update JCB-GDAS hash
DavidNew-NOAA Sep 17, 2024
bbff0d7
Update FV3-JEDI hash to new develop
DavidNew-NOAA Sep 19, 2024
418f060
Merge branch 'develop' into feature/hydrostatic-delz
DavidNew-NOAA Sep 19, 2024
cac380c
Wrong FV3-JEDI hash
DavidNew-NOAA Sep 19, 2024
03b50c5
update parm/jcb-gdas hash to change hydrostatic_delz to delz
RussTreadon-NOAA Sep 25, 2024
585bd79
Merge branch 'develop' into feature/hydrostatic-delz
RussTreadon-NOAA Sep 25, 2024
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
2 changes: 1 addition & 1 deletion parm/io/fv3jedi_fieldmetadata_fv3inc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ field metadata:
- long name: air_pressure_thickness
io name: delp_inc

- long name: hydrostatic_layer_thickness
- long name: layer_thickness
io name: delz_inc

2 changes: 1 addition & 1 deletion parm/jcb-gdas
Open in desktop
Submodule jcb-gdas updated 2 files
+1 −1 algorithm/atmosphere/fv3jedi_fv3inc_lgetkf.yaml.j2
+1 −1 algorithm/atmosphere/fv3jedi_fv3inc_variational.yaml.j2
2 changes: 1 addition & 1 deletion sorc/fv3-jedi
Open in desktop
Submodule fv3-jedi updated 26 files
+0 −10 src/fv3jedi/FieldMetadata/FieldsMetadataDefault.h
+16 −5 src/fv3jedi/Geometry/Geometry.cc
+2 −0 src/fv3jedi/Geometry/GeometryParameters.h
+4 −3 src/fv3jedi/IO/FV3Restart/IOFms.cc
+1 −0 src/fv3jedi/IO/FV3Restart/IOFms.h
+10 −4 src/fv3jedi/IO/FV3Restart/IOFms.interface.F90
+2 −2 src/fv3jedi/IO/FV3Restart/IOFms.interface.h
+7 −4 src/fv3jedi/IO/FV3Restart/fv3jedi_io_fms_mod.f90
+2 −0 src/fv3jedi/LinearVariableChange/LinearVariableChange.cc
+2 −1 src/fv3jedi/ModelData/ModelData.cc
+15 −15 src/fv3jedi/VariableChange/Model2GeoVaLs/fv3jedi_vc_model2geovals_mod.f90
+10 −5 test/CMakeLists.txt
+13 −6 test/setup-c48.sh
+152 −0 test/testinput/4dvar_append_obs.yaml
+0 −1 test/testinput/4dvar_hybrid_linear_model.yaml
+19 −9 test/testinput/linearization_error.yaml
+1 −1 test/testinput/state_gfs.yaml
+8 −8 test/testoutput/3dvar_lam_cmaq.ref
+47 −0 test/testoutput/4dvar_append_obs.ref
+10 −10 test/testoutput/convertstate_gfs_ana2bvars.ref
+2 −2 test/testoutput/diffstates_lam_cmaq.ref
+23 −23 test/testoutput/eda_4dvar_fv3lm.ref
+17 −17 test/testoutput/ensembleb_dirac_local_gfs_12pe.ref
+1 −1 test/testoutput/ensembleb_nicas_gfs.ref
+12 −11 test/testoutput/hofx_nomodel_lam_cmaq.ref
+16 −16 test/testoutput/letkf3d.ref
2 changes: 1 addition & 1 deletion test/fv3jedi/testinput/gdasapp_fv3jedi_fv3inc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variable change:
variable change name: Model2GeoVaLs
input variables: &bkgvars [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr,surface_geopotential_height]
output variables: &fv3incrvars [ua,va,t,sphum,ice_wat,liq_wat,o3mr,delp,hydrostatic_delz]
output variables: &fv3incrvars [ua,va,t,sphum,ice_wat,liq_wat,o3mr,delp,delz]
jedi increment variables: [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr]
fv3 increment variables: *fv3incrvars
background geometry:
Expand Down
2 changes: 1 addition & 1 deletion test/fv3jedi/testoutput/gdasapp_fv3jedi_fv3inc.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ cloud_liquid_ice | Min:+0.0000000000000000e+00 Max:+
cloud_liquid_water | Min:+0.0000000000000000e+00 Max:+0.0000000000000000e+00 RMS:+0.0000000000000000e+00
ozone_mass_mixing_ratio | Min:+0.0000000000000000e+00 Max:+0.0000000000000000e+00 RMS:+0.0000000000000000e+00
air_pressure_thickness | Min:-2.9992886080290191e+00 Max:+1.5291703492039233e+00 RMS:+1.7535872214547940e-01
hydrostatic_layer_thickness | Min:-4.6699236754648155e-01 Max:+7.4693987323735200e-01 RMS:+3.1162055487823255e-02
layer_thickness | Min:-4.6699236754648155e-01 Max:+7.4693987323735200e-01 RMS:+3.1162055487823255e-02
----------------------------------------------------------------------------------------------------
Loading