Misc updates (#65)

* convert corr length from gaussian to GC

* add "default" var change

* update reference answers

src/umdsst/CMakeLists.txt

@@ -34,3 +34,4 @@ add_subdirectory(Increment)
 add_subdirectory(LinearVariableChange)
 add_subdirectory(ModelAux)
 add_subdirectory(State)
+add_subdirectory(VariableChange)

src/umdsst/Covariance/Covariance.cc

@@ -74,8 +74,11 @@ namespace umdsst {
       conf.get("correlation lengths", corrConf);
       if ( corrConf.has("fixed") ) {
         // single global value for correlation length given
+        // note: BUMP expects the length as a Gaspari-Cohn cutoff length,
+        //   but we probably think of it as a Gaussian 1 sigma, so convert.
         double val;
         corrConf.get("fixed", val);
+        val*=3.57;  // gaussian to GC
         param_view.assign(val);
       } else {
         util::abor1_cpp("Covariance::Covariance() no correlation length "

src/umdsst/VariableChange/CMakeLists.txt

@@ -0,0 +1,3 @@
+umdsst_target_sources(
+    VariableChange.cc
+)

src/umdsst/VariableChange/VariableChange.cc

@@ -0,0 +1,17 @@
+/*
+ * (C) Copyright 2021-2021 UCAR, University of Maryland
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ */
+
+#include "oops/base/VariableChangeBase.h"
+#include "oops/generic/IdVariableChange.h"
+#include "umdsst/Traits.h"
+
+namespace umdsst {
+
+static oops::GenericVariableChangeMaker<Traits,
+  oops::IdVariableChange<Traits> > makerVariableChange_("default");
+
+}  // namespace umdsst

test/testinput/staticbinit.yml

@@ -28,4 +28,4 @@ background error:
     mpicom: 2
     strategy: specific_univariate
   correlation lengths:
-    fixed: 3.0e6
+    fixed: 840.0e3

test/testref/dirac.ref

@@ -1,2 +1,2 @@
 Test     : Input Dirac increment: min = 0, max = 1, mean = 0.000138889
-Test     : B * Increment: min = 0, max = 1, mean = 0.0698168
+Test     : B * Increment: min = -0, max = 1, mean = 0.0697115

test/testref/var.ref

@@ -1,9 +1,9 @@
 Test     : CostJb   : Nonlinear Jb = 0
 Test     : CostJo   : Nonlinear Jo(sea_surface_temperature) = 8450.12, nobs = 127, Jo/n = 66.5364, err = 0.369977
-Test     : CostFunction: Nonlinear J = 8450.12 
-Test     : DRIPCGMinimizer: reduction in residual norm = 0.0443003
-Test     : CostFunction::addIncrement: Analysis: min = -1.82546, max = 31.8058, mean = 13.4629
+Test     : CostFunction: Nonlinear J = 8450.12
+Test     : DRIPCGMinimizer: reduction in residual norm = 0.0429602
+Test     : CostFunction::addIncrement: Analysis: min = -5.77236, max = 31.8058, mean = 13.4612
 Test     : umdsst::ModelAuxControl not implemented
-Test     : CostJb   : Nonlinear Jb = 490.143
-Test     : CostJo   : Nonlinear Jo(sea_surface_temperature) = 193.425, nobs = 127, Jo/n = 1.52303, err = 0.369977
-Test     : CostFunction: Nonlinear J = 683.568
+Test     : CostJb   : Nonlinear Jb = 489.763
+Test     : CostJo   : Nonlinear Jo(sea_surface_temperature) = 191.27, nobs = 127, Jo/n = 1.50606, err = 0.369977
+Test     : CostFunction: Nonlinear J = 681.033