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 gdas.cd #2978

Open
wants to merge 20 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
84600b6
wip, added tools to select mom6 levels
guillaumevernieres Oct 2, 2024
303d417
pynorm ...
guillaumevernieres Oct 2, 2024
24839f5
switched to dict
guillaumevernieres Oct 3, 2024
9538ba5
Update ush/python/pygfs/utils/marine_da_utils.py
guillaumevernieres Oct 7, 2024
4a3d981
new jedi hashes
guillaumevernieres Oct 7, 2024
bd4478e
Merge branch 'develop' into feature/update_hashes
guillaumevernieres Oct 11, 2024
e9ad837
updated gdas
guillaumevernieres Oct 11, 2024
9536c8b
Merge branch 'develop' into feature/update_hashes
aerorahul Oct 11, 2024
f5f3638
Merge branch 'develop' into feature/update_hashes
guillaumevernieres Oct 16, 2024
81dcd72
turn off C96C48_hybatmaerosnowDA CI on wcoss2
RussTreadon-NOAA Oct 17, 2024
5869ff3
Merge branch 'develop' into feature/update_hashes
RussTreadon-NOAA Oct 17, 2024
e9fa90c
update sorc/gdas.cd to point at GDASApp patch/gwci
RussTreadon-NOAA Oct 17, 2024
ea9f2d0
Merge branch 'develop' into feature/update_hashes
RussTreadon-NOAA Oct 21, 2024
896afea
Merge branch 'develop' into feature/update_hashes
RussTreadon-NOAA Oct 21, 2024
9a81d9d
Merge branch 'develop' into feature/update_hashes
RussTreadon-NOAA Oct 22, 2024
dc2ae99
update gdas_fv3jedi_ver to 20241022
RussTreadon-NOAA Oct 22, 2024
a98803f
Merge branch 'develop' into feature/update_hashes
RussTreadon-NOAA Oct 22, 2024
4f17f52
Merge branch 'develop' into feature/update_hashes
RussTreadon-NOAA Oct 23, 2024
6c30d36
update gdas.cd hash in response to g-w issue #3022
RussTreadon-NOAA Oct 23, 2024
228c42c
Merge branch 'develop' into feature/update_hashes
RussTreadon-NOAA Oct 24, 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 sorc/gdas.cd
Submodule gdas.cd updated 76 files
+1 −1 build.sh
+1 −0 modulefiles/GDAS/hera.intel.lua
+1 −0 modulefiles/GDAS/hercules.intel.lua
+1 −0 modulefiles/GDAS/orion.intel.lua
+1 −0 modulefiles/GDAS/wcoss2.intel.lua
+1 −1 parm/io/fv3jedi_fieldmetadata_fv3inc.yaml
+1 −1 parm/jcb-gdas
+1 −1 parm/soca/berror/obsolete/soca_parameters_diffusion_hz.yaml
+1 −1 parm/soca/berror/obsolete/soca_parameters_diffusion_vt.yaml
+2 −2 parm/soca/berror/soca_hybrid_bmat.yaml
+11 −11 parm/soca/berror/soca_parameters_diffusion_hz.yaml.j2
+9 −8 parm/soca/berror/soca_parameters_diffusion_vt.yaml.j2
+0 −42 parm/soca/berror/soca_static_bmat.yaml
+2 −2 parm/soca/berror/soca_vtscales.yaml.j2
+1 −0 parm/soca/marine-jcb-base.yaml
+45 −0 parm/soca/obs/config/icec_amsu_mb_l2.yaml
+45 −0 parm/soca/obs/config/icec_atms_n20_l2.yaml
+45 −0 parm/soca/obs/config/icec_atms_n21_l2.yaml
+45 −0 parm/soca/obs/config/icec_atms_npp_l2.yaml
+45 −0 parm/soca/obs/config/icec_gmi_gpm_l2.yaml
+45 −0 parm/soca/obs/config/icec_ssmis_f17_l2.yaml
+45 −0 parm/soca/obs/config/icec_viirs_n20_l2_north.yaml
+45 −0 parm/soca/obs/config/icec_viirs_n20_l2_south.yaml
+8 −0 parm/soca/obs/obs_list.yaml
+64 −0 parm/soca/obsprep/obsprep_config.yaml
+1 −1 sorc/da-utils
+1 −1 sorc/fv3-jedi
+1 −1 sorc/ioda
+1 −1 sorc/iodaconv
+1 −1 sorc/oops
+1 −1 sorc/saber
+1 −1 sorc/soca
+1 −1 sorc/ufo
+1 −1 sorc/vader
+2 −0 test/CMakeLists.txt
+7 −5 test/aero/CMakeLists.txt
+40 −40 test/atm/global-workflow/3dvar.ref
+8 −8 test/atm/global-workflow/lgetkf_observer.ref
+20 −20 test/atm/global-workflow/lgetkf_solver.ref
+1 −1 test/fv3jedi/testinput/gdasapp_fv3jedi_fv3inc.yaml
+1 −1 test/fv3jedi/testoutput/gdasapp_fv3jedi_fv3inc.ref
+18 −16 test/gw-ci/CMakeLists.txt
+161 −0 test/marine/CMakeLists.txt
+13 −0 test/marine/testinput/bufr2ioda_insitu_profile_argo_2021063006.yaml.in
+13 −0 test/marine/testinput/bufr2ioda_insitu_profile_bathy_2021063006.yaml.in
+13 −0 test/marine/testinput/bufr2ioda_insitu_profile_glider_2021063006.yaml.in
+13 −0 test/marine/testinput/bufr2ioda_insitu_profile_tesac_2021063006.yaml.in
+13 −0 test/marine/testinput/bufr2ioda_insitu_profile_xbtctd_2021063006.yaml.in
+13 −0 test/marine/testinput/bufr2ioda_insitu_surface_trkob_2021063006.yaml.in
+23 −0 test/marine/testref/bufr2ioda_insitu_profile_argo_2021063006.ref
+20 −0 test/marine/testref/bufr2ioda_insitu_profile_bathy_2021063006.ref
+23 −0 test/marine/testref/bufr2ioda_insitu_profile_glider_2021063006.ref
+23 −0 test/marine/testref/bufr2ioda_insitu_profile_tesac_2021063006.ref
+23 −0 test/marine/testref/bufr2ioda_insitu_profile_xbtctd_2021063006.ref
+19 −0 test/marine/testref/bufr2ioda_insitu_surface_trkob_2021063006.ref
+1 −1 test/snow/letkfoi_snow.yaml
+33 −0 ush/ioda/bufr2ioda/marine/b2i/argo_ioda_variables.py
+0 −0 ush/ioda/bufr2ioda/marine/b2i/b2iconverter/__init__.py
+71 −0 ush/ioda/bufr2ioda/marine/b2i/b2iconverter/bufr2ioda_config.py
+119 −0 ush/ioda/bufr2ioda/marine/b2i/b2iconverter/bufr2ioda_converter.py
+99 −0 ush/ioda/bufr2ioda/marine/b2i/b2iconverter/ioda_addl_vars.py
+96 −0 ush/ioda/bufr2ioda/marine/b2i/b2iconverter/ioda_metadata.py
+128 −0 ush/ioda/bufr2ioda/marine/b2i/b2iconverter/ioda_variables.py
+131 −0 ush/ioda/bufr2ioda/marine/b2i/b2iconverter/ocean.py
+176 −0 ush/ioda/bufr2ioda/marine/b2i/b2iconverter/util.py
+59 −0 ush/ioda/bufr2ioda/marine/b2i/bathy_ioda_variables.py
+39 −0 ush/ioda/bufr2ioda/marine/b2i/bufr2ioda_insitu_profile_argo.py
+32 −0 ush/ioda/bufr2ioda/marine/b2i/bufr2ioda_insitu_profile_bathy.py
+33 −0 ush/ioda/bufr2ioda/marine/b2i/bufr2ioda_insitu_profile_glider.py
+34 −0 ush/ioda/bufr2ioda/marine/b2i/bufr2ioda_insitu_profile_tesac.py
+33 −0 ush/ioda/bufr2ioda/marine/b2i/bufr2ioda_insitu_profile_xbtctd.py
+38 −0 ush/ioda/bufr2ioda/marine/b2i/bufr2ioda_insitu_surface_trkob.py
+41 −0 ush/ioda/bufr2ioda/marine/b2i/glider_ioda_variables.py
+27 −0 ush/ioda/bufr2ioda/marine/b2i/tesac_ioda_variables.py
+87 −0 ush/ioda/bufr2ioda/marine/b2i/trkob_ioda_variables.py
+25 −0 ush/ioda/bufr2ioda/marine/b2i/xbtctd_ioda_variables.py
1 change: 1 addition & 0 deletions ush/python/pygfs/task/marine_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ def _prep_variational_yaml(self: Task) -> None:
envconfig_jcb['cyc'] = os.getenv('cyc')
envconfig_jcb['SOCA_NINNER'] = self.task_config.SOCA_NINNER
envconfig_jcb['obs_list'] = ['adt_rads_all']
envconfig_jcb['MOM6_LEVS'] = mdau.get_mom6_levels(str(self.task_config.OCNRES))

# Write obs_list_short
save_as_yaml(parse_obs_list_file(self.task_config.MARINE_OBS_LIST_YAML), 'obs_list_short.yaml')
Expand Down
33 changes: 33 additions & 0 deletions ush/python/pygfs/utils/marine_da_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,3 +166,36 @@ def clean_empty_obsspaces(config, target, app='var'):

# save cleaned yaml
save_as_yaml(config, target)


@logit(logger)
def get_mom6_levels(ocnres: str) -> int:
"""
Temporary function that returns the number of vertical levels in MOM6 given the horizontal resolution.
This is requiered by the diffusion saber block that now makes use of oops::util::FieldSetHelpers::writeFieldSet
and requires the number of levels in the configuration. I have been told this will be changed in the future.
guillaumevernieres marked this conversation as resolved.
Show resolved Hide resolved

Parameters
-----------
ocnres: str
Input resolution for ocean in str format. e.g. '500', '100', '050', '025'

Returns
-------
nlev: int
number of levels in the ocean model given an input resolution
"""

# Currently implemented resolutions
ocnres_to_nlev = {
'500': 25,
'100': 75,
'050': 75,
'025': 75
}
try:
nlev = ocnres_to_nlev.get(ocnres)
except KeyError:
raise KeyError("FATAL ERROR: Invalid ocnres value. Aborting.")

return nlev
Loading