replace nc4 with nc in setup_exp.py, correct JEDI DA var and ens bug …

…in resource setting (NOAA-EMC#2294)
RussTreadon-NOAA · Feb 29, 2024 · b13a8d4 · b13a8d4
1 parent a84a484
commit b13a8d4
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/parm/config/gfs/config.atmanlinit b/parm/config/gfs/config.atmanlinit
@@ -6,5 +6,6 @@
 echo "BEGIN: config.atmanlinit"
 
 # Get task specific resources
+. "${EXPDIR}/config.atmanl"
 . "${EXPDIR}/config.resources" atmanlinit
 echo "END: config.atmanlinit"
diff --git a/parm/config/gfs/config.atmanlrun b/parm/config/gfs/config.atmanlrun
@@ -6,6 +6,7 @@
 echo "BEGIN: config.atmanlrun"
 
 # Get task specific resources
+. "${EXPDIR}/config.atmanl"
 . "${EXPDIR}/config.resources" atmanlrun
 
 echo "END: config.atmanlrun"
diff --git a/parm/config/gfs/config.atmensanlinit b/parm/config/gfs/config.atmensanlinit
@@ -6,5 +6,6 @@
 echo "BEGIN: config.atmensanlinit"
 
 # Get task specific resources
+. "${EXPDIR}/config.atmensanl"
 . "${EXPDIR}/config.resources" atmensanlinit
 echo "END: config.atmensanlinit"
diff --git a/parm/config/gfs/config.atmensanlrun b/parm/config/gfs/config.atmensanlrun
@@ -6,6 +6,7 @@
 echo "BEGIN: config.atmensanlrun"
 
 # Get task specific resources
+. "${EXPDIR}/config.atmensanl"
 . "${EXPDIR}/config.resources" atmensanlrun
 
 echo "END: config.atmensanlrun"
diff --git a/workflow/setup_expt.py b/workflow/setup_expt.py
@@ -219,7 +219,7 @@ def link_files_from_src_to_dst(src_dir, dst_dir):
     src_dir = os.path.join(inputs.icsdir, current_cycle_dir, src_atm_anl_dir)
     dst_dir = os.path.join(rotdir, current_cycle_dir, dst_atm_anl_dir)
     makedirs_if_missing(dst_dir)
-    for ftype in ['abias', 'abias_pc', 'abias_air', 'radstat', 'atms_n20.satbias.nc4', 'atms_n20.satbias_cov.nc4', 'atms_n20.tlapse.txt']:
+    for ftype in ['abias', 'abias_pc', 'abias_air', 'radstat', 'atms_n20.satbias.nc', 'atms_n20.satbias_cov.nc', 'atms_n20.tlapse.txt']:
         fname = f'{inputs.cdump}.t{idatestr[8:]}z.{ftype}'
         src_file = os.path.join(src_dir, fname)
         if os.path.exists(src_file):