Merge branch 'ufs-community:develop' into ss150

natalie-perlin · Dec 20, 2023 · 28d0643 · 28d0643
2 parents 31975f6 + b840e7c
commit 28d0643
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/tests/WE2E/machine_suites/coverage.hera.gnu.com b/tests/WE2E/machine_suites/coverage.hera.gnu.com
@@ -1,4 +1,4 @@
-custom_ESGgrid_Peru_12km
+custom_ESGgrid_Central_Asia_3km
 get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2019061200
 get_from_NOMADS_ics_FV3GFS_lbcs_FV3GFS
 grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR

diff --git a/tests/WE2E/machine_suites/coverage.hera.intel.nco b/tests/WE2E/machine_suites/coverage.hera.intel.nco
@@ -1,4 +1,4 @@
-custom_ESGgrid_Central_Asia_3km
+custom_ESGgrid_Peru_12km
 get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2019061200
 get_from_HPSS_ics_GDAS_lbcs_GDAS_fmt_netcdf_2022040400_ensemble_2mems
 get_from_HPSS_ics_HRRR_lbcs_RAP

diff --git a/ush/config_defaults.yaml b/ush/config_defaults.yaml
@@ -805,7 +805,7 @@ workflow:
   #
   #-----------------------------------------------------------------------
   #
-  FIXdir: '{{ EXPTDIR if rocoto.tasks.get("task_make_grid") else [user.HOMEdir, "fix"]|path_join }}'
+  FIXdir: '{{ EXPTDIR }}'
   FIXam: '{{ [FIXdir, "fix_am"]|path_join }}'
   FIXclim: '{{ [FIXdir, "fix_clim"]|path_join }}'
   FIXlam: '{{ [FIXdir, "fix_lam"]|path_join }}'