Skip to content

Commit

Permalink
point to staged ic's
Browse files Browse the repository at this point in the history
  • Loading branch information
@guillaumevernieres
guillaumevernieres committed Nov 26, 2024
1 parent 3a9cc08 commit cdb7f6d
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 14 deletions.
4 changes: 1 addition & 3 deletions ci/cases/pr/C48mx500_3DVarAOWCDA.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ arguments:
resdetocean: 5.0
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
# TODO: Stage IC's on HPC
#icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C48mx500/20240610
icsdir: /work/noaa/da/gvernier/ensda/ictest
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C48mx500/20241120
idate: 2021032418
edate: 2021032500
nens: 0
Expand Down
5 changes: 1 addition & 4 deletions ci/cases/pr/C48mx500_hybAOWCDA.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ arguments:
resdetocean: 5.0
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
# TODO: Stage IC's on HPC
#icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C48mx500/20240610
icsdir: /work/noaa/da/gvernier/ensda/ictest
#icsdir: /scratch2/NCEPDEV/ocean/Guillaume.Vernieres/data/prepics/ictest/
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C48mx500/20241120
idate: 2021032418
edate: 2021032500
nens: 2
Expand Down
2 changes: 1 addition & 1 deletion jobs/JGLOBAL_MARINE_ANALYSIS_FINALIZE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ status=$?
# Remove the Temporary working directory
##########################################
cd "${DATAROOT}" || exit 1
[[ "${KEEPDATA}" = "NO" ]] && rm -rf "${DATA}"
#[[ "${KEEPDATA}" = "NO" ]] && rm -rf "${DATA}"

exit 0
2 changes: 1 addition & 1 deletion sorc/gdas.cd
Submodule gdas.cd updated 58 files
+1 −0 ci/hera.sh
+1 −0 ci/orion.sh
+1 −1 ci/run_ci.sh
+1 −1 ci/run_gw_ci.sh
+5 −0 parm/atm/jcb-base.yaml.j2
+10 −0 parm/atm/jcb-prototype_3dvar-fv3inc.yaml.j2
+7 −0 parm/atm/jcb-prototype_3dvar.yaml.j2
+10 −0 parm/atm/jcb-prototype_lgetkf-fv3inc.yaml.j2
+7 −0 parm/atm/jcb-prototype_lgetkf.yaml.j2
+7 −0 parm/atm/jcb-prototype_lgetkf_observer.yaml.j2
+7 −0 parm/atm/jcb-prototype_lgetkf_solver.yaml.j2
+1 −1 parm/jcb-algorithms
+98 −0 parm/soca/berror/soca_ensb.yaml.j2
+27 −71 parm/soca/berror/soca_ensrecenter.yaml
+38 −0 parm/soca/berror/soca_parameters_diffusion_hz.yaml.j2
+34 −0 parm/soca/berror/soca_parameters_diffusion_vt.yaml.j2
+4 −3 parm/soca/ensda/stage_ens_mem.yaml.j2
+7 −0 parm/soca/marine-jcb-3dfgat.yaml.j2
+4 −0 parm/soca/marine-jcb-base.yaml
+3 −5 parm/soca/obsprep/obsprep_config.yaml
+0 −7 test/CMakeLists.txt
+81 −58 test/atm/global-workflow/CMakeLists.txt
+3 −0 test/atm/global-workflow/config.yaml
+10 −0 test/atm/global-workflow/jcb-prototype_3dvar-fv3inc.yaml.j2
+2 −2 test/atm/global-workflow/jcb-prototype_3dvar.yaml.j2
+10 −0 test/atm/global-workflow/jcb-prototype_lgetkf-fv3inc.yaml.j2
+2 −2 test/atm/global-workflow/jcb-prototype_lgetkf.yaml.j2
+2 −2 test/atm/global-workflow/jcb-prototype_lgetkf_observer.yaml.j2
+2 −2 test/atm/global-workflow/jcb-prototype_lgetkf_solver.yaml.j2
+0 −23 test/fv3jedi/CMakeLists.txt
+0 −65 test/fv3jedi/testinput/gdasapp_fv3jedi_fv3inc.yaml
+0 −41 test/fv3jedi/testoutput/gdasapp_fv3jedi_fv3inc.ref
+367 −94 test/gw-ci/CMakeLists.txt
+35 −19 test/gw-ci/run_exp.sh
+54 −0 test/testreference/C48mx500_3DVarAOWCDA_3dfgat.ref
+41 −0 test/testreference/C96C48_ufs_hybatmDA_3dvar-fv3inc.ref
+124 −0 test/testreference/C96C48_ufs_hybatmDA_3dvar.ref
+82 −0 test/testreference/C96C48_ufs_hybatmDA_lgetkf-fv3inc.ref
+126 −0 test/testreference/C96C48_ufs_hybatmDA_lgetkf_observer.ref
+180 −0 test/testreference/C96C48_ufs_hybatmDA_lgetkf_solver.ref
+41 −0 test/testreference/atm_jjob_3dvar-fv3inc.ref
+0 −0 test/testreference/atm_jjob_3dvar.ref
+123 −0 test/testreference/atm_jjob_lgetkf-fv3inc.ref
+0 −0 test/testreference/atm_jjob_lgetkf.ref
+0 −0 test/testreference/atm_jjob_lgetkf_observer.ref
+0 −0 test/testreference/atm_jjob_lgetkf_solver.ref
+0 −1 ush/CMakeLists.txt
+0 −187 ush/jediinc2fv3.py
+63 −56 ush/soca/marine_recenter.py
+19 −3 utils/fv3jedi/fv3jedi_fv3inc.h
+29 −0 utils/soca/fig_gallery/marine_vrfy_display/README
+724 −0 utils/soca/fig_gallery/marine_vrfy_display/default.css
+422 −0 utils/soca/fig_gallery/marine_vrfy_display/fonts.css
+862 −0 utils/soca/fig_gallery/marine_vrfy_display/index_vrfy_marine.html
+46 −11 utils/soca/gdas_ens_handler.h
+1 −1 utils/soca/gdas_incr_handler.h
+11 −10 utils/soca/gdas_postprocincr.h
+27 −6 utils/soca/gdas_soca_diagb.h
2 changes: 1 addition & 1 deletion sorc/gfs_utils.fd
Submodule gfs_utils.fd updated 6 files
+0 −1 parm/ocnicepost/ocean.csv
+0 −1 src/CMakeLists.txt
+0 −19 src/gefs_6h_ave_1mem.fd/CMakeLists.txt
+0 −473 src/gefs_6h_ave_1mem.fd/gefs_6h_ave_1mem.f90
+0 −96 src/gefs_6h_ave_1mem.fd/printinfr.f90
+0 −272 src/gefs_6h_ave_1mem.fd/prlevel.f90
2 changes: 1 addition & 1 deletion sorc/verif-global.fd
Submodule verif-global.fd updated 1 files
+30 −10 ush/run_verif_global_in_global_workflow.sh
2 changes: 1 addition & 1 deletion ush/python/pygfs/task/marine_analysis.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ def create_obs_space(data):

# get the variable name, assume 1 variable per file
nc = netCDF4.Dataset(obsfile, 'r')
variable = next(iter(nc.groups["ObsValue"].variables))
variable = next(iter(nc.groups["ombg"].variables))
nc.close()

# filling values for the templated yaml
Expand Down
2 changes: 1 addition & 1 deletion workflow/hosts/hercules.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ STMP: '/work/noaa/stmp/${USER}/HERCULES'
PTMP: '/work/noaa/stmp/${USER}/HERCULES'
NOSCRUB: $HOMEDIR
SCHEDULER: slurm
ACCOUNT: fv3-cpu
ACCOUNT: da-cpu
QUEUE: batch
QUEUE_SERVICE: batch
PARTITION_BATCH: hercules
Expand Down
2 changes: 1 addition & 1 deletion workflow/rocoto/gfs_tasks.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ def marinebmat(self):
data = f'{ocean_hist_path}/[email protected]'
dep_dict = {'type': 'data', 'data': data, 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}
deps.append(rocoto.add_dependency(dep_dict))
if self.app_config.do_hybvar:
if self.options['do_hybvar']:
dep_dict = {'type': 'metatask', 'name': 'enkfgdas_fcst', 'offset': f"-{timedelta_to_HMS(self._base['interval_gdas'])}"}
deps.append(rocoto.add_dependency(dep_dict))
dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
Expand Down

0 comments on commit cdb7f6d

Please sign in to comment.