using new app to create mom6 iau incr

NOAA-EMC · Jul 6, 2023 · 2579f17 · 2579f17
1 parent fe2111d
commit 2579f17
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/parm/soca/variational/socaincr2mom6.yaml b/parm/soca/variational/socaincr2mom6.yaml
@@ -17,7 +17,7 @@ vertical geometry:
 soca increment:
   date: '{{ATM_WINDOW_BEGIN}}'
   basename: ./Data/
-  ocn_filename: 'ocn.3dvarfgat_pseudo.incr.{{ATM_WINDOW_MIDDLE}}.nc'
+  ocn_filename: 'ocn.3dvarfgat_pseudo.incr.{{ATM_WINDOW_BEGIN}}.nc'
   read_from_file: 1
 
 mom6 iau increment:

diff --git a/scripts/exgdas_global_marine_analysis_chkpt.sh b/scripts/exgdas_global_marine_analysis_chkpt.sh
@@ -55,10 +55,7 @@ EOF
                                                 --out "${mom6_iau_incr}" \
                                                 --nsst_yaml "nsst.yaml"
 else
-   ${HOMEgfs}/sorc/gdas.cd/ush/socaincr2mom6.py --incr "${soca_incr}" \
-                                                --bkg "${DATA}/INPUT/MOM.res.nc" \
-                                                --grid "${DATA}/soca_gridspec.nc" \
-                                                --out "${mom6_iau_incr}"
+   $APRUN_OCNANAL ${JEDI_BIN}/socaincr2mom6.x socaincr2mom6.yaml
 fi
 export err=$?
 if [ $err -gt 0  ]; then

diff --git a/scripts/exgdas_global_marine_analysis_prep.py b/scripts/exgdas_global_marine_analysis_prep.py
@@ -475,6 +475,14 @@ def find_clim_ens(input_date):
     yaml.dump(soca2cice_cfg, f, sort_keys=False, default_flow_style=False)
     ufsda.genYAML.genYAML('tmp.yaml', output=varchgyaml)
 
+# prepare yaml for soca to MOM6 IAU increment
+logging.info(f"---------------- generate soca to MOM6 IAU yaml")
+socaincr2mom6_yaml = os.path.join(anl_dir, 'socaincr2mom6.yaml')
+socaincr2mom6_yaml_template = os.path.join(gdas_home, 'parm', 'soca', 'variational', 'socaincr2mom6.yaml')
+s2mconfig = YAMLFile(path=socaincr2mom6_yaml_template)
+s2mconfig = Template.substitute_structure(s2mconfig, TemplateConstants.DOUBLE_CURLY_BRACES, envconfig.get)
+s2mconfig.save(socaincr2mom6_yaml)
+
 ################################################################################
 # Copy initial condition
 ics_list = []