Save changes

NOAA-EMC · Dec 30, 2024 · 90465fc · 90465fc
1 parent 83056d7
commit 90465fc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/parm/jcb-gdas b/parm/jcb-gdas
diff --git a/sorc/oops b/sorc/oops
diff --git a/utils/fv3jedi/fv3jedi_fv3inc.h b/utils/fv3jedi/fv3jedi_fv3inc.h
@@ -12,8 +12,11 @@
 #include "fv3jedi/Geometry/Geometry.h"
 #include "fv3jedi/Increment/Increment.h"
 #include "fv3jedi/State/State.h"
+#include "fv3jedi/Utilities/Traits.h"
 #include "fv3jedi/VariableChange/VariableChange.h"
 
+#include "oops/base/StructuredGridPostProcessor.h"
+#include "oops/base/StructuredGridWriter.h"
 #include "oops/mpi/mpi.h"
 #include "oops/runs/Application.h"
 #include "oops/util/ConfigFunctions.h"
@@ -91,7 +94,7 @@ namespace gdasapp {
       const fv3jedi::Geometry stateGeom(stateGeomConfig, this->getComm());
       const fv3jedi::Geometry jediIncrGeom(jediIncrGeomConfig, this->getComm());
       const fv3jedi::Geometry fv3IncrGeom(fv3IncrGeomConfig, this->getComm());
-
+      
       // Setup variable change
       std::unique_ptr<fv3jedi::VariableChange> vc;
       vc.reset(new fv3jedi::VariableChange(varChangeConfig, stateGeom));
@@ -104,9 +107,10 @@ namespace gdasapp {
         // ---------------------------------------------------------------------------------
 
         // Get input configurations
-        eckit::LocalConfiguration stateInputConfig(membersConfig[imem], "background input");
-        eckit::LocalConfiguration jediIncrInputConfig(membersConfig[imem], "jedi increment input");
-        eckit::LocalConfiguration fv3IncrOuputConfig(membersConfig[imem], "fv3 increment output");
+        const eckit::LocalConfiguration stateInputConfig(membersConfig[imem], "background input");
+        const eckit::LocalConfiguration jediIncrInputConfig(membersConfig[imem], "jedi increment input");
+        const eckit::LocalConfiguration fv3IncrOuputConfig(membersConfig[imem], "fv3 increment output");
+        const eckit::LocalConfiguration anlOuputConfig(membersConfig[imem], "analysis to structured grid");        
 
         // Read background state
         fv3jedi::State xxBkg(stateGeom, stateInputConfig);
@@ -176,6 +180,12 @@ namespace gdasapp {
 
         // Write FV3 increment
         dxFV3.write(fv3IncrOuputConfig);
+
+        // Write analysis
+        //        const oops::StructuredGridWriter<fv3jedi::Traits> analysis(anlOuputConfig, xxAnl.geometry());
+        const oops::Geometry<fv3jedi::Traits> foo(stateGeomConfig, this->getComm());
+        const oops::StructuredGridWriter<fv3jedi::Traits> analysis(anlOuputConfig, foo);
+        analysis.interpolateAndWrite(xxAnl);
       }
 
       return 0;
+4 −4		algorithm/marine/soca_2cice_global.yaml.j2
+1 −1		algorithm/marine/soca_diagb.yaml.j2
+1 −1		algorithm/marine/soca_parameters_diffusion_hz.yaml.j2
+2 −2		algorithm/marine/soca_setcorscales.yaml.j2
+10 −1		algorithm/marine/socaincr2mom6.yaml.j2
+1 −3		model/atmosphere/atmosphere_background.yaml.j2
+1 −3		model/atmosphere/atmosphere_background_ensemble.yaml.j2
+15 −1		model/marine/marine_background.yaml.j2
+45 −14		model/marine/marine_background_error_hybrid_diffusion_diffusion.yaml.j2
+22 −4		model/marine/marine_background_error_static_diffusion.yaml.j2
+1 −1		observations/marine/adt_rads_all.yaml.j2
+12 −0		observations/marine/icec_abi_g16_l2.yaml.j2
+6 −0		observations/marine/icec_amsr2_north.yaml.j2
+6 −0		observations/marine/icec_amsr2_south.yaml.j2
+12 −0		observations/marine/icec_amsu_mb_l2.yaml.j2
+12 −0		observations/marine/icec_atms_n20_l2.yaml.j2
+12 −0		observations/marine/icec_atms_n21_l2.yaml.j2
+12 −0		observations/marine/icec_atms_npp_l2.yaml.j2
+6 −0		observations/marine/icec_gmi_gpm_l2.yaml.j2
+12 −0		observations/marine/icec_ssmis_f17_l2.yaml.j2
+12 −0		observations/marine/icec_viirs_n20_l2_north.yaml.j2
+12 −0		observations/marine/icec_viirs_n20_l2_south.yaml.j2
+2 −1		observations/marine/sss_smap_l2.yaml.j2
+2 −1		observations/marine/sss_smos_l2.yaml.j2