Updating examples [skip ci]

examples/dummy/config_fwd_long.yml

@@ -30,6 +30,7 @@ model:
   plugin:
     name: dummy
     version: std
+  reload_H:  !join [*outdir, /H_matrix.pickle]
   save_H: true
 obsvect:
   dir_obsvect:  !join [*outdir, /ref_obsvect]
@@ -68,6 +69,20 @@ datavect:
     flux:
       parameters:
         CH4:
+          bands_i:
+          - 0
+          - 3
+          - 6
+          - 9
+          - 12
+          bands_j:
+          - 0
+          - 3
+          - 6
+          - 9
+          - 12
+          - 15
+          - 18
           err: 1
           errtype: max
           flx_formula:
@@ -91,7 +106,7 @@ datavect:
             evalmin: 0
             landsea: false
             sigma: 500
-          hresol: hpixels
+          hresol: ibands
           nlev: 1
           plugin:
             name: dummy

examples/dummy/config_inversion_long_bands_4dvar_M1QN3.yml

 rootdir: &rootdir /tmp/CIF/
-outdir: !join [*rootdir, /.tox/py38/tmp]
+outdir: &outdir  !join [*rootdir, /.tox/py38/tmp]
 verbose: 2
 logfile: pycif.logtest
-workdir: !join [*outdir, /inversion_long_bands_4dvar_M1QN3]
+workdir:  !join [*outdir, /inversion_long_bands_4dvar_M1QN3]
 datei: 2010-01-01
 datef: 2010-01-05 00:00:00
 mode:
   minimizer:
     df1: 0.5
     epsg: 0.0002
-    maxiter: 10
-    nsim: 10
+    maxiter: 5
+    nsim: 5
     plugin:
       name: M1QN3
       version: std
@@ -19,7 +19,10 @@ mode:
         name: gausscost
         version: std
       reload_from_previous: true
-  montecarlo: 10
+  montecarlo:
+    nsample: 10
+    perturb_x: true
+    perturb_y: false
   plugin:
     name: 4dvar
     version: std
@@ -38,14 +41,14 @@ model:
   chemistry:
     acspecies:
       CH4: null
-  file_pg: !join [*rootdir, /model_sources/dummy_gauss/Pasquill-Gifford.txt]
+  file_pg:  !join [*rootdir, /model_sources/dummy_gauss/Pasquill-Gifford.txt]
   plugin:
     name: dummy
     version: std
-  reload_H: !join [*outdir, /H_matrix.pickle]
+  reload_H:  !join [*outdir, /H_matrix.pickle]
   save_H: true
 obsvect:
-  dir_obsvect: !join [*outdir, /ref_obsvect]
+  dir_obsvect:  !join [*outdir, /ref_obsvect]
   dump_type: nc
   plugin:
     name: standard
@@ -66,7 +69,7 @@ datavect:
           seed: true
           seed_id: 5
           zmax: 100
-    fluxes:
+    flux:
       parameters:
         CH4:
           bands_i:
@@ -102,7 +105,6 @@ datavect:
                 square: null
                 variable: zlon
           hcorrelations:
-            dircorrel: !join [*outdir, /test_integration_inversion_dum4/datavect]
             dump_hcorr: true
             evalmin: 0
             landsea: false
@@ -111,7 +113,7 @@ datavect:
           nlev: 1
           plugin:
             name: dummy
-            type: fluxes
+            type: flux
             version: txt
           tcorrelations:
             sigma_t: 12

examples/dummy/config_inversion_long_bands_4dvar_congrad.yml

 rootdir: &rootdir /tmp/CIF/
-outdir: !join [*rootdir, /.tox/py38/tmp]
+outdir: &outdir  !join [*rootdir, /.tox/py38/tmp]
 verbose: 2
 logfile: pycif.logtest
-workdir: !join [*outdir, /inversion_long_bands_4dvar_congrad]
+workdir:  !join [*outdir, /inversion_long_bands_4dvar_congrad]
 datei: 2010-01-01
 datef: 2010-01-05 00:00:00
 mode:
   minimizer:
     df1: 0.5
     epsg: 0.0002
-    maxiter: 10
-    nsim: 10
+    maxiter: 5
+    nsim: 5
     plugin:
       name: congrad
       version: std
@@ -38,14 +38,14 @@ model:
   chemistry:
     acspecies:
       CH4: null
-  file_pg: !join [*rootdir, /model_sources/dummy_gauss/Pasquill-Gifford.txt]
+  file_pg:  !join [*rootdir, /model_sources/dummy_gauss/Pasquill-Gifford.txt]
   plugin:
     name: dummy
     version: std
-  reload_H: !join [*outdir, /H_matrix.pickle]
+  reload_H:  !join [*outdir, /H_matrix.pickle]
   save_H: true
 obsvect:
-  dir_obsvect: !join [*outdir, /ref_obsvect]
+  dir_obsvect:  !join [*outdir, /ref_obsvect]
   dump_type: nc
   plugin:
     name: standard
@@ -66,7 +66,7 @@ datavect:
           seed: true
           seed_id: 5
           zmax: 100
-    fluxes:
+    flux:
       parameters:
         CH4:
           bands_i:
@@ -102,7 +102,6 @@ datavect:
                 square: null
                 variable: zlon
           hcorrelations:
-            dircorrel: !join [*outdir, /test_integration_inversion_dum9/datavect]
             dump_hcorr: true
             evalmin: 0
             landsea: false
@@ -111,7 +110,7 @@ datavect:
           nlev: 1
           plugin:
             name: dummy
-            type: fluxes
+            type: flux
             version: txt
           tcorrelations:
             sigma_t: 12

examples/dummy/config_inversion_long_bands_ensrf_.yml

 rootdir: &rootdir /tmp/CIF/
-outdir: !join [*rootdir, /.tox/py38/tmp]
+outdir: &outdir  !join [*rootdir, /.tox/py38/tmp]
 verbose: 2
 logfile: pycif.logtest
-workdir: !join [*outdir, /inversion_long_bands_ensrf_]
+workdir:  !join [*outdir, /inversion_long_bands_ensrf_]
 datei: 2010-01-01
 datef: 2010-01-05 00:00:00
 mode:
-  nsample: 100
+  nsample: 50
   plugin:
     name: EnSRF
     version: std
@@ -24,14 +24,14 @@ model:
   chemistry:
     acspecies:
       CH4: null
-  file_pg: !join [*rootdir, /model_sources/dummy_gauss/Pasquill-Gifford.txt]
+  file_pg:  !join [*rootdir, /model_sources/dummy_gauss/Pasquill-Gifford.txt]
   plugin:
     name: dummy
     version: std
-  reload_H: !join [*outdir, /H_matrix.pickle]
+  reload_H:  !join [*outdir, /H_matrix.pickle]
   save_H: true
 obsvect:
-  dir_obsvect: !join [*outdir, /ref_obsvect]
+  dir_obsvect:  !join [*outdir, /ref_obsvect]
   dump_type: nc
   plugin:
     name: standard
@@ -52,7 +52,7 @@ datavect:
           seed: true
           seed_id: 5
           zmax: 100
-    fluxes:
+    flux:
       parameters:
         CH4:
           bands_i:
@@ -88,7 +88,6 @@ datavect:
                 square: null
                 variable: zlon
           hcorrelations:
-            dircorrel: !join [*outdir, /test_integration_inversion_dum5/datavect]
             dump_hcorr: true
             evalmin: 0
             landsea: false
@@ -97,7 +96,7 @@ datavect:
           nlev: 1
           plugin:
             name: dummy
-            type: fluxes
+            type: flux
             version: txt
           tcorrelations:
             sigma_t: 12