Update

NOAA-EMC · Nov 8, 2024 · 929f7c7 · 929f7c7
1 parent 262d451
commit 929f7c7
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 178 deletions.
diff --git a/parm/atm/jcb-base.yaml.j2 b/parm/atm/jcb-base.yaml.j2
@@ -27,6 +27,15 @@ final_prints_frequency: PT3H
 number_of_outer_loops: 2
 analysis_variables: [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr]
 
+# Testing
+# -------
+
+{% if DO_JEDI_TESTING == 'YES' %}
+do_testing: true
+{% else %}
+do_testing: false
+{% endif %}
+
 # Model things
 # ------------
 # Geometry
@@ -139,12 +148,3 @@ atmosphere_ensemble_increment_prefix: "./anl/mem%{member}%/atminc."
 atmosphere_posterior_output_gaussian: "./mem%{member}%/atmanl."
 
 atmosphere_ensemble_history_prefix: "enkf{{GPREFIX}}"
-
-# Testing
-# -------
-
-{% if DO_CI_TESTING == 'YES' %}
-atmosphere_do_testing: true
-{% else %}
-atmosphere_do_testing: false
-{% endif %}
diff --git a/parm/atm/jcb-prototype_3dvar-fv3inc.yaml.j2 b/parm/atm/jcb-prototype_3dvar-fv3inc.yaml.j2
@@ -4,9 +4,7 @@ algorithm: fv3jedi_fv3inc_variational
 
 # Testing things
 # --------------
-{% if atmosphere_do_testing %}
 test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/gw-ci/3dvar-fv3inc.ref
 test_output_filename: ./3dvar.out
 test_float_relative_tolerance: 1.0e-3
 test_float_absolute_tolerance: 1.0e-5
-{% endif %}
diff --git a/parm/atm/jcb-prototype_3dvar.yaml.j2 b/parm/atm/jcb-prototype_3dvar.yaml.j2
@@ -29,13 +29,4 @@ observations:
 #  - satwnd.viirs_npp
 #  - scatwind_ascat_metop-a
 #  - snowcvr
-#   - abi_g16
-
-# Testing things
-# --------------
-{% if atmosphere_do_testing %}
-test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/gw-ci/3dvar.ref
-test_output_filename: ./3dvar.out
-test_float_relative_tolerance: 1.0e-3
-test_float_absolute_tolerance: 1.0e-5
-{% endif %}
+#  - abi_g16
diff --git a/parm/atm/jcb-prototype_lgetkf-fv3inc.yaml.j2 b/parm/atm/jcb-prototype_lgetkf-fv3inc.yaml.j2
@@ -4,9 +4,7 @@ algorithm: fv3jedi_fv3inc_lgetkf
 
 # Testing things
 # --------------
-{% if atmosphere_do_testing %}
 test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/gw-ci/lgetkf-fv3inc.ref
 test_output_filename: ./3dvar.out
 test_float_relative_tolerance: 1.0e-3
 test_float_absolute_tolerance: 1.0e-5
-{% endif %}
diff --git a/parm/atm/jcb-prototype_lgetkf.yaml.j2 b/parm/atm/jcb-prototype_lgetkf.yaml.j2
@@ -38,12 +38,3 @@ observations:
   - satwnd.viirs_npp
 #  - scatwind_ascat_metop-a
 #  - snowcvr
-
-# Testing things
-# --------------
-{% if atmosphere_do_testing %}
-test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/gw-ci/lgetkf.ref
-test_output_filename: ./lgetkf.out
-test_float_relative_tolerance: 1.0e-3
-test_float_absolute_tolerance: 1.0e-5
-{% endif %}
diff --git a/parm/atm/jcb-prototype_lgetkf_observer.yaml.j2 b/parm/atm/jcb-prototype_lgetkf_observer.yaml.j2
@@ -44,12 +44,3 @@ atmosphere_obsdataout_prefix: diag_lobs_
 
 # Distribution type
 distribution_type: RoundRobin
-
-# Testing things
-# --------------
-{% if atmosphere_do_testing %}
-test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/gw-ci/lgetkf_observer.ref
-test_output_filename: ./lgetkf_observer.out
-test_float_relative_tolerance: 1.0e-3
-test_float_absolute_tolerance: 1.0e-5
-{% endif %}
diff --git a/parm/atm/jcb-prototype_lgetkf_solver.yaml.j2 b/parm/atm/jcb-prototype_lgetkf_solver.yaml.j2
@@ -47,12 +47,3 @@ atmosphere_obsdataout_prefix: diag_solv_
 
 # Distribution type
 distribution_type: Halo
-
-# Testing things
-# --------------
-{% if atmosphere_do_testing %}
-test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/gw-ci/lgetkf_solver.ref
-test_output_filename: ./lgetkf_solver.out
-test_float_relative_tolerance: 1.0e-3
-test_float_absolute_tolerance: 1.0e-5
-{% endif %}
diff --git a/parm/jcb-algorithms b/parm/jcb-algorithms
diff --git a/parm/jcb-gdas b/parm/jcb-gdas
diff --git a/sorc/fv3-jedi b/sorc/fv3-jedi
diff --git a/sorc/saber b/sorc/saber
diff --git a/test/gw-ci/3dvar.ref b/test/gw-ci/3dvar.ref