Merge branch 'develop' into feature/calcanl

NOAA-EMC · Sep 12, 2024 · 07e6528 · 07e6528
2 parents 40523d9 + 032b708
commit 07e6528
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 16 deletions.
diff --git a/parm/aero/variational/3dvar_fgat_gfs_aero.yaml.j2 b/parm/aero/variational/3dvar_fgat_gfs_aero.yaml.j2
@@ -96,6 +96,8 @@ variational:
 final:
   diagnostics:
     departures: anlmob
+  prints:
+    frequency: PT3H
   increment:
     geometry:
       fms initialization:

diff --git a/parm/aero/variational/3dvar_gfs_aero.yaml.j2 b/parm/aero/variational/3dvar_gfs_aero.yaml.j2
@@ -87,6 +87,8 @@ variational:
 final:
   diagnostics:
     departures: anlmob
+  prints:
+    frequency: PT3H
   increment:
     geometry:
       fms initialization:

diff --git a/parm/atm/jcb-base.yaml.j2 b/parm/atm/jcb-base.yaml.j2
@@ -23,6 +23,7 @@ window_length: "{{ ATM_WINDOW_LENGTH }}"
 bound_to_include: begin
 minimizer: DRPCG
 final_diagnostics_departures: anlmob
+final_prints_frequency: PT3H
 number_of_outer_loops: 2
 analysis_variables: [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr]
 

diff --git a/parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_ahi.json b/parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_ahi.json
@@ -6,10 +6,11 @@
   "dump_directory"   : "{{ DMPDIR }}",
   "ioda_directory"   : "{{ COM_OBS }}",
   "subsets"          : [ "NC005044", "NC005045", "NC005046" ],
-  "data_description" : "NC005044 JMA SATWIND, AHI HIM8 IR(LW)/VIS/WV-CT/WV-CS;  NC005045 JMA SATWIND, HIMAWARI-8 IR(LW)/VIS/WV-CT/WV-CS; NC005046 JMA SATWIND, HIMAWARI-8 IR(LW)/VIS/WV-CT/WV-CS", 
+  "data_description" : "NC005044 JMA SATWIND, AHI HIMAWARI IR(LW)/VIS/WV-CT/WV-CS;  NC005045 JMA SATWIND, AHI HIMAWARI IR(LW)/VIS/WV-CT/WV-CS; NC005046 JMA SATWIND, AHI HIMAWARI IR(LW)/VIS/WV-CT/WV-CS", 
   "data_provider"    : "JMA",
   "sensor_info"      : { "sensor_name": "AHI",  "sensor_full_name": "Advanced Himawari Imager",  "sensor_id": 999 },
   "satellite_info"   : [
                           { "satellite_name": "H8", "satellite_full_name": "Himawari-8", "satellite_id": 173, "launch time": "YYYYMMDD" },
-                      ]
+                          { "satellite_name": "H9", "satellite_full_name": "Himawari-9", "satellite_id": 174, "launch time": "YYYYMMDD" },
+                       ]
 }
diff --git a/parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_seviri.json b/parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_seviri.json
@@ -11,6 +11,8 @@
   "sensor_info"      : { "sensor_name": "SEVIRI",  "sensor_full_name": "Spinning Enhanced Visible and InfraRed Imager",  "sensor_id": 999 },
   "satellite_info"   : [
                           { "satellite_name": "M8", "satellite_full_name": "METEOSAT-8", "satellite_id": 55, "launch time": "YYYYMMDD" },
+                          { "satellite_name": "M9", "satellite_full_name": "METEOSAT-9", "satellite_id": 56, "launch time": "YYYYMMDD" },
+                          { "satellite_name": "M10", "satellite_full_name": "METEOSAT-10", "satellite_id": 57, "launch time": "YYYYMMDD" },
                           { "satellite_name": "M11", "satellite_full_name": "METEOSAT-11", "satellite_id": 70, "launch time": "YYYYMMDD" },
                        ]
 }
diff --git a/parm/snow/jcb-base.yaml.j2 b/parm/snow/jcb-base.yaml.j2
@@ -40,7 +40,7 @@ snow_increment_time_fv3: "{{ bkg_time_fv3 }}"
 analysis_variables: [ua,va,t,ps,sphum,ice_wat,liq_wat,o3mr]
 minimizer: DRPCG
 final_diagnostics_departures: anlmob
-
+final_prints_frequency: PT3H
 cost_type: 3D-Var
 number_of_outer_loops: 2
 

diff --git a/parm/soca/marine-jcb-base.yaml b/parm/soca/marine-jcb-base.yaml
@@ -22,6 +22,7 @@ window_length: '{{ATM_WINDOW_LENGTH}}'
 bound_to_include: begin
 minimizer: RPCG
 final_diagnostics_departures: oman
+final_prints_frequency: PT3H
 number_of_outer_loops: 1
 analysis_variables: [cicen, hicen, hsnon, socn, tocn, uocn, vocn, ssh]
 

diff --git a/parm/soca/variational/3dvarfgat.yaml b/parm/soca/variational/3dvarfgat.yaml
@@ -51,6 +51,8 @@ output:
 final:
   diagnostics:
     departures: oman
+  prints:
+    frequency: PT3H
   increment:
     output:
       state component:

diff --git a/test/atm/global-workflow/3dvar.ref b/test/atm/global-workflow/3dvar.ref
@@ -88,3 +88,7 @@ sensorScanAngle_order_2:  Min= -5.1097259522434877,  Max= 2.8632600312042698,  N
 ---------------------------------------------------------------
 
 
+CostJb   : Nonlinear Jb = 0.0000033199535370
+CostJo   : Nonlinear Jo(AMSUA N19) = 39476.8510817764617968, nobs = 73667, Jo/n = 0.5358824315063252, err = 6.2697697603632934
+CostJo   : Nonlinear Jo(sondes) = 10639.2476170353256748, nobs = 4255, Jo/n = 2.5004107208073623, err = 10.9811231401273197
+CostFunction: Nonlinear J = 50116.0987021317414474
diff --git a/test/atm/global-workflow/jjob_ens_init.sh b/test/atm/global-workflow/jjob_ens_init.sh
@@ -73,16 +73,12 @@ for file in $flist; do
    ln -fs $GDASAPP_TESTDATA/lowres/$dpath/${oprefix}.${file}.nc4 $COM_OBS/${oprefix}.${file}.nc
 done
 
-# Link radiance bias correction files
+# Link radiance bias correction tarball
 dpath=gdas.$gPDY/$gcyc/analysis/atmos
 mkdir -p $COM_ATMOS_ANALYSIS_PREV
-flist="amsua_n19.satbias amsua_n19.satbias_cov"
+flist="rad_varbc_params.tar"
 for file in $flist; do
-   ln -fs $GDASAPP_TESTDATA/lowres/$dpath/$gprefix.${file}.nc4 $COM_ATMOS_ANALYSIS_PREV/$gprefix.${file}.nc
-done
-flist="amsua_n19.tlapse.txt"
-for file in $flist; do
-   ln -fs $GDASAPP_TESTDATA/lowres/$dpath/$gprefix.$file $COM_ATMOS_ANALYSIS_PREV/$gprefix.$file
+   ln -fs $GDASAPP_TESTDATA/lowres/$dpath/$gprefix.${file} $COM_ATMOS_ANALYSIS_PREV/$gprefix.${file}
 done
 
 # Link member atmospheric background on tiles and atmf006

diff --git a/test/atm/global-workflow/jjob_var_init.sh b/test/atm/global-workflow/jjob_var_init.sh
@@ -75,18 +75,15 @@ for file in $flist; do
    ln -fs $GDASAPP_TESTDATA/lowres/$dpath/${oprefix}.${file}.nc4 $COM_OBS/${oprefix}.${file}.nc
 done
 
-# Link radiance bias correction files
+# Link radiance bias correction tarball
 dpath=gdas.$gPDY/$gcyc/analysis/atmos
 mkdir -p $COM_ATMOS_ANALYSIS_PREV
-flist="amsua_n19.satbias amsua_n19.satbias_cov"
-for file in $flist; do
-   ln -fs $GDASAPP_TESTDATA/lowres/$dpath/$gprefix.${file}.nc4 $COM_ATMOS_ANALYSIS_PREV/$gprefix.${file}.nc
-done
-flist="amsua_n19.tlapse.txt"
+flist="rad_varbc_params.tar"
 for file in $flist; do
    ln -fs $GDASAPP_TESTDATA/lowres/$dpath/$gprefix.${file} $COM_ATMOS_ANALYSIS_PREV/$gprefix.${file}
 done
 
+
 # Link atmospheric history on gaussian grid
 dpath=gdas.$gPDY/$gcyc/model/atmos/history
 mkdir -p $COM_ATMOS_HISTORY_PREV