From 6ab97f1ec09005207fd6f6c141be2d6afa0682e3 Mon Sep 17 00:00:00 2001 From: Dan Lea Date: Thu, 24 Oct 2024 10:51:54 +0100 Subject: [PATCH] Change bump settings to make test for setting up grid quicker. Attempt to revert change to not use missing-if-all-missing in atlas interpolator. --- src/tests/testinput/3dvar_sic.yaml | 2 +- src/tests/testinput/bump_nicas_setup.yaml | 5 +++-- src/tests/testoutput/test_3dvar_sic.ref | 17 ++--------------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/tests/testinput/3dvar_sic.yaml b/src/tests/testinput/3dvar_sic.yaml index 384e418..e1e1ef2 100644 --- a/src/tests/testinput/3dvar_sic.yaml +++ b/src/tests/testinput/3dvar_sic.yaml @@ -89,7 +89,7 @@ cost function: time interpolation: linear atlas-interpolator: type: unstructured-bilinear-lonlat -# non_linear: missing-if-all-missing + non_linear: missing-if-all-missing max_fraction_elems_to_try: 0.0 adjoint: true obs operator: diff --git a/src/tests/testinput/bump_nicas_setup.yaml b/src/tests/testinput/bump_nicas_setup.yaml index f26b394..620191b 100644 --- a/src/tests/testinput/bump_nicas_setup.yaml +++ b/src/tests/testinput/bump_nicas_setup.yaml @@ -23,12 +23,13 @@ background error: do not cross mask boundaries: true nicas: explicit length-scales: true - resolution: 4.0 + resolution: 3.0 # resolution: 8.0 horizontal length-scale: - groups: - ice_area_fraction - value: 2.0e6 + value: 4.0e7 +# value: 4.0e6 vertical length-scale: - groups: - ice_area_fraction diff --git a/src/tests/testoutput/test_3dvar_sic.ref b/src/tests/testoutput/test_3dvar_sic.ref index 7ba2995..ac5131d 100644 --- a/src/tests/testoutput/test_3dvar_sic.ref +++ b/src/tests/testoutput/test_3dvar_sic.ref @@ -9,18 +9,5 @@ Level 1 ~> 100.0% Level 1 ~> 0.100E+01 vert. coord. CostJb : Nonlinear Jb = 0.0000000000000000e+00 -CostJo : Nonlinear Jo(Sea Ice) = 1.0178967056984216e+08, nobs = 48, Jo/n = 2.1206181368717118e+06, err = 2.0000000000000000e+00 -CostFunction: Nonlinear J = 1.0178967056984216e+08 -DRPCGMinimizer: reduction in residual norm = 3.8373920435826797e+01 -CostFunction::addIncrement: Analysis: - Model state valid at time: 2021-06-29T12:00:00Z - 1 variables: ice_area_fraction - atlas field norms: - ice_area_fraction: 2.64715e-01 - - - - -CostJb : Nonlinear Jb = 0.00000e+00 -CostJo : Nonlinear Jo(Sea Ice) = 1.00960e+08, nobs = 48, Jo/n = 2.10333e+06, err = 2.00000e+00 -CostFunction: Nonlinear J = 1.00960e+08 +CostJo : Nonlinear Jo(Sea Ice) = 1.5000000000000000e+00, nobs = 48, Jo/n = 3.1250000000000000e-02, err = 2.0000000000000000e+00 +CostFunction: Nonlinear J = 1.5000000000000000e+00