switched to ens. templ. (#894)

JCSDA-internal · Jun 12, 2023 · 5cc3b00 · 5cc3b00
1 parent 7f4cc74
commit 5cc3b00
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 65 deletions.
diff --git a/test/testinput/ensrecenter.yml b/test/testinput/ensrecenter.yml
@@ -3,33 +3,28 @@ geometry:
   mom6_input_nml: data_static/72x35x25/input.nml
   fields metadata: data_static/fields_metadata.yml
 
-recenter variables:  &soca_vars [cicen, hicen, socn, tocn, uocn, vocn, ssh, hocn]
+recenter variables: [cicen, hicen, socn, tocn, uocn, vocn, ssh, hocn]
 
-_file: &_file
+center:
   read_from_file: 1
   date: &date_bkg 2018-04-15T00:00:00Z
   basename: data_static/72x35x25/
-  remap_filename: data_static/72x35x25/restarts/MOM.res.nc
-  state variables:  *soca_vars
-
-center:
-  <<: *_file
   ocn_filename: restarts/MOM.res.nc
   ice_filename: restarts/cice.res.nc
+  state variables: [cicen, hicen, socn, tocn, uocn, vocn, ssh, hocn]
 
 ensemble:
-- <<: *_file
-  ocn_filename: restarts_ens/ocn.enspert.ens.1.2018-04-15T00:00:00Z.PT0S.nc
-  ice_filename: restarts_ens/ice.enspert.ens.1.2018-04-15T00:00:00Z.PT0S.nc
-- <<: *_file
-  ocn_filename: restarts_ens/ocn.enspert.ens.2.2018-04-15T00:00:00Z.PT0S.nc
-  ice_filename: restarts_ens/ice.enspert.ens.2.2018-04-15T00:00:00Z.PT0S.nc
-- <<: *_file
-  ocn_filename: restarts_ens/ocn.enspert.ens.3.2018-04-15T00:00:00Z.PT0S.nc
-  ice_filename: restarts_ens/ice.enspert.ens.3.2018-04-15T00:00:00Z.PT0S.nc
-- <<: *_file
-  ocn_filename: restarts_ens/ocn.enspert.ens.4.2018-04-15T00:00:00Z.PT0S.nc
-  ice_filename: restarts_ens/ice.enspert.ens.4.2018-04-15T00:00:00Z.PT0S.nc
+  members from template:
+    template:
+      read_from_file: 1
+      date: 2018-04-15T00:00:00Z
+      basename: data_static/72x35x25/
+      remap_filename: data_static/72x35x25/restarts/MOM.res.nc
+      ocn_filename: restarts_ens/ocn.enspert.ens.%mem%.2018-04-15T00:00:00Z.PT0S.nc
+      ice_filename: restarts_ens/ice.enspert.ens.%mem%.2018-04-15T00:00:00Z.PT0S.nc
+      state variables: [cicen, hicen, socn, tocn, uocn, vocn, ssh, hocn]
+    pattern: %mem%
+    nmembers: 4
 
 recentered output:
   datadir: data_generated/ensrecenter

diff --git a/test/testref/ensrecenter.test b/test/testref/ensrecenter.test
@@ -1,45 +1,4 @@
-Original member 0 : 
-  Valid time: 2018-04-15T00:00:00Z
-  cicen   min=-0.0180955754853549   max=1.0154619226063759   mean=0.1166559214269191
-  hicen   min=-1.1890165225084572   max=4.4225078395956468   mean=0.4878445368603064
-   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5465781554557907
-   tocn   min=-3.0349249096390292   max=31.6933380143948185   mean=6.0892725584520484
-   uocn   min=-0.8641522861445371   max=0.7036119745230547   mean=-0.0002857015738898
-   vocn   min=-0.7634486847749620   max=1.4361818799661243   mean=0.0022068423582755
-    ssh   min=-1.8995576445088340   max=0.9067222046846501   mean=-0.2838774533760896
-   hocn   min=0.0009999999999977   max=1345.6400000000003274   mean=128.6280642065023017
-Original member 1 : 
-  Valid time: 2018-04-15T00:00:00Z
-  cicen   min=-0.0247023492233052   max=1.0059459646290563   mean=0.1154142044557038
-  hicen   min=-1.0525169199849722   max=4.1546737436317498   mean=0.4567518994354456
-   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5055452687632709
-   tocn   min=-4.3530127339125704   max=32.1361532537345269   mean=5.9997330166046199
-   uocn   min=-0.8640250705300543   max=0.7018932512522951   mean=-0.0002805634195630
-   vocn   min=-0.7694797184378191   max=1.4375515680969777   mean=0.0022353832122642
-    ssh   min=-1.9417433210038664   max=0.9333653213444889   mean=-0.2625528699976196
-   hocn   min=0.0009999999999977   max=1345.6400000000003274   mean=128.6280642065023017
-Original member 2 : 
-  Valid time: 2018-04-15T00:00:00Z
-  cicen   min=-0.0227811160460197   max=1.0160377768915954   mean=0.1181463420420533
-  hicen   min=-1.1200598164376829   max=4.4611418886050034   mean=0.4644287571903185
-   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5185040290381124
-   tocn   min=-3.6774466807639863   max=31.7319078471261271   mean=6.1014244712456316
-   uocn   min=-0.8556783788890301   max=0.6967957239020900   mean=-0.0002933351246698
-   vocn   min=-0.7695355448839387   max=1.4325062616604824   mean=0.0021755906289718
-    ssh   min=-2.0615870929429634   max=0.9597858134058795   mean=-0.2700534030103711
-   hocn   min=0.0009999999999977   max=1345.6400000000003274   mean=128.6280642065023017
-Original member 3 : 
-  Valid time: 2018-04-15T00:00:00Z
-  cicen   min=-0.0276364646919061   max=1.0109165019309718   mean=0.1168022339555029
-  hicen   min=-0.9513178045052427   max=4.4234174558971864   mean=0.5133224517507193
-   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5332012222342186
-   tocn   min=-2.9385030739976097   max=31.7429976792228743   mean=6.0349465069279997
-   uocn   min=-0.8597490363137734   max=0.7017681968682301   mean=-0.0002421232906620
-   vocn   min=-0.7687583640000475   max=1.4312050700381247   mean=0.0022075875858246
-    ssh   min=-1.8977903550750153   max=0.9436246320617075   mean=-0.2728329753762969
-   hocn   min=0.0009999999999977   max=1345.6400000000003274   mean=128.6280642065023017
-Ensemble mean: 
-
+Ensemble mean:
   Valid time: 2018-04-15T00:00:00Z
   cicen   min=-0.0112418992909670   max=1.0059927218502691   mean=0.1167546754700448
   hicen   min=-0.4958783724376303   max=4.2383578169684073   mean=0.4805869113091976
@@ -49,7 +8,7 @@ Ensemble mean:
    vocn   min=-0.7677450905884780   max=1.4343611949404274   mean=0.0022063509463340
     ssh   min=-1.9007772322014664   max=0.9358744928741816   mean=-0.2723291754400941
    hocn   min=0.0009999999999977   max=1345.6400000000003274   mean=128.6280642065023017
-Recentered member 0 : 
+Recentered member 0 :
   Valid time: 2018-04-15T00:00:00Z
   cicen   min=-0.0189143937311176   max=1.0106697794618935   mean=0.1174138220581671
   hicen   min=-0.9286403104170223   max=4.0987248612518545   mean=0.4785091961285005
@@ -59,7 +18,7 @@ Recentered member 0 :
    vocn   min=-0.7619065784170974   max=1.4395973259678576   mean=0.0021977544518945
     ssh   min=-1.9509159635387290   max=0.8981303635972274   mean=-0.2883386202951616
    hocn   min=0.0009999999999977   max=1345.6400000000003274   mean=128.6280642065023017
-Recentered member 1 : 
+Recentered member 1 :
   Valid time: 2018-04-15T00:00:00Z
   cicen   min=-0.0188510647742279   max=1.0061196531255039   mean=0.1161721050869519
   hicen   min=-0.8461711969146404   max=3.9489832350880372   mean=0.4474165587036401
@@ -69,7 +28,7 @@ Recentered member 1 :
    vocn   min=-0.7678447493973665   max=1.4409670140987110   mean=0.0022262953058832
     ssh   min=-1.9038431693041962   max=0.9247734802570662   mean=-0.2670140369166917
    hocn   min=0.0009999999999977   max=1345.6400000000003274   mean=128.6280642065023017
-Recentered member 2 : 
+Recentered member 2 :
   Valid time: 2018-04-15T00:00:00Z
   cicen   min=-0.0200602591344653   max=1.0136449008968589   mean=0.1189042426733013
   hicen   min=-0.9157652538122391   max=4.4370592359462879   mean=0.4550934164585130
@@ -79,7 +38,7 @@ Recentered member 2 :
    vocn   min=-0.7679005758434860   max=1.4359217076622157   mean=0.0021665027225908
     ssh   min=-2.0371056288096168   max=0.9511939723184568   mean=-0.2745145699294432
    hocn   min=0.0009999999999977   max=1345.6400000000003274   mean=128.6280642065023017
-Recentered member 3 : 
+Recentered member 3 :
   Valid time: 2018-04-15T00:00:00Z
   cicen   min=-0.0240524488167127   max=1.0106570181835552   mean=0.1175601345867509
   hicen   min=-0.8018100260389662   max=4.5194509810571182   mean=0.5039871110189132