yaml reorg

NOAA-EMC · Sep 9, 2024 · d6d442f · d6d442f
1 parent be72aa2
commit d6d442f
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 101 deletions.
diff --git a/parm/soca/berror/soca_diagb.yaml.j2 b/parm/soca/berror/soca_diagb.yaml.j2
@@ -12,7 +12,7 @@ background:
   read_from_file: 1
 
 background error:
-  datadir: ./diagb/
+  datadir: ./staticb/
   date: '{{ MARINE_WINDOW_MIDDLE | to_isotime }}'
   exp: bkgerr_stddev
   type: incr

diff --git a/parm/soca/berror/soca_ensb.yaml.j2 b/parm/soca/berror/soca_ensb.yaml.j2
@@ -34,44 +34,44 @@ steric height:
   - linear variable change name: BalanceSOCA  # Only the steric balance is applied
 
 ensemble mean output:
-  datadir: ./diagb/
+  datadir: ./staticb/
   date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
   exp: ens_mean
   type: incr
 
 ssh output:
   unbalanced:
-    datadir: ./diagb/
+    datadir: ./staticb/
     date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
     exp: ssh_unbal_stddev
     type: incr
 
   steric:
-    datadir: ./diagb/
+    datadir: ./staticb/
     date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
     exp: ssh_steric_stddev
     type: incr
 
   total:
-    datadir: ./diagb/
+    datadir: ./staticb/
     date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
     exp: ssh_total_stddev
     type: incr
 
   explained variance:
-    datadir: ./diagb/
+    datadir: ./staticb/
     date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
     exp: steric_explained_variance
     type: incr
 
   recentering error:
-    datadir: ./diagb/
+    datadir: ./staticb/
     date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
     exp: ssh_recentering_error
     type: incr
 
 background error output:
-  datadir: ./diagb/
+  datadir: ./staticb/
   date: '{{ MARINE_WINDOW_BEGIN | to_isotime }}'
   exp: bkgerr_stddev
   type: incr

diff --git a/parm/soca/berror/soca_parameters_diffusion_hz.yaml.j2 b/parm/soca/berror/soca_parameters_diffusion_hz.yaml.j2
@@ -27,11 +27,11 @@ background error:
             filename: ocn.cor_rh.incr.0001-01-01T00:00:00Z.nc
             variable name: ave_ssh
         write:
-          filename: hz_ocean.nc
+          filename: ./staticb/hz_ocean.nc
 
       - name: ice
         horizontal:
           as gaussian: true
           fixed value: 50000.0
         write:
-          filename: hz_ice.nc
+          filename: ./staticb/hz_ice.nc
diff --git a/parm/soca/berror/soca_parameters_diffusion_vt.yaml.j2 b/parm/soca/berror/soca_parameters_diffusion_vt.yaml.j2
@@ -29,4 +29,4 @@ background error:
             filename: vt_scales.nc
             variable name: vt
         write:
-          filename: vt_ocean.nc
+          filename: ./staticb/vt_ocean.nc
diff --git a/parm/soca/berror/soca_vtscales.yaml.j2 b/parm/soca/berror/soca_vtscales.yaml.j2
@@ -1,6 +1,6 @@
 gridspec_filename: soca_gridspec.nc
 restart_filename: ./INPUT/MOM.res.nc
-mld_filename: './diagb/ocn.bkgerr_stddev.incr.{{ MARINE_WINDOW_END | to_isotime }}.nc'
+mld_filename: './staticb/ocn.bkgerr_stddev.incr.{{ MARINE_WINDOW_END | to_isotime }}.nc'
 output_filename: ./vt_scales.nc
 output_variable_vt: vt
 output_variable_hz: hz

diff --git a/parm/soca/varchange/soca_2cice_antarctic.yaml b/parm/soca/varchange/soca_2cice_antarctic.yaml
diff --git a/parm/soca/varchange/soca_2cice_arctic.yaml b/parm/soca/varchange/soca_2cice_arctic.yaml
diff --git a/test/gw-ci/CMakeLists.txt b/test/gw-ci/CMakeLists.txt
@@ -56,9 +56,9 @@ set(TASK_LIST
   "gdasmarinebmat"
   "gdasmarineanlinit"
   "gdasmarineanlvar"
-  "gdasocnanalchkpt"
+  "gdasmarineanlchkpt"
   "gdasocnanalpost"
-  )
+w  )
 add_cycling_tests(${pslot} ${YAML_PATH} ${HOMEgfs} ${RUNTESTS} ${PROJECT_SOURCE_DIR} "${TASK_LIST}")
 
 # Aero-Land DA, C96
@@ -81,10 +81,10 @@ set(pslot "GFSv17-3DVAR-C384mx025")
 set(YAML_PATH ${HOMEgfs}/ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml)
 set(TASK_LIST
   "gdasprepoceanobs"
-  "gdasocnanalprep"
-  "gdasocnanalbmat"
-  "gdasocnanalrun"
-  "gdasocnanalchkpt"
+  "gdasmarinebmat"
+  "gdasmarineanlinit"
+  "gdasmarineanlvar"
+  "gdasmarineanlchkpt"
   "gdasocnanalpost"
   "gdasocnanalvrfy"
   "gdasprep"