Skip to content

Commit

Permalink
Update hashes
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidNew-NOAA committed Jan 17, 2025
1 parent 74a32ae commit 42f2113
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion sorc/fv3-jedi
2 changes: 1 addition & 1 deletion sorc/oops
Submodule oops updated from ef9de0 to d829ed
20 changes: 10 additions & 10 deletions utils/fv3jedi/fv3jedi_ecen.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace gdasapp {
fullConfig.get("window begin", windowBeginStr);
const util::DateTime windowBegin(windowBeginStr);
const oops::Variables atmStateVars(fullConfig, "atmospheric state variables");
const oops::Variables sfcStateVars(fullConfig, "surface state variables");
const oops::Variables sfcStateVars(fullConfig, "surface state variables");
const oops::Variables atmIncrVars(fullConfig, "atmospheric increment variables");

// Get geometry configurations
Expand Down Expand Up @@ -78,7 +78,7 @@ namespace gdasapp {

// Get elements of individual additions configurations
const eckit::LocalConfiguration atmBkgConfig(additionsConfig[ihrs], "atmospheric background");
const eckit::LocalConfiguration sfcBkgConfig(additionsConfig[ihrs], "surface background");
const eckit::LocalConfiguration sfcBkgConfig(additionsConfig[ihrs], "surface background");
const eckit::LocalConfiguration atmIncrConfig(additionsConfig[ihrs], "atmospheric increment");
const eckit::LocalConfiguration atmAnlEnsMeanConfig(additionsConfig[ihrs], \
"atmospheric ensemble mean analysis");
Expand All @@ -91,38 +91,38 @@ namespace gdasapp {

// Initialize background states
oops::State<fv3jedi::Traits> xxAtmBkg(bkgGeom, atmStateVars, currentCycle);
oops::State<fv3jedi::Traits> xxSfcBkg(bkgGeom, sfcStateVars, currentCycle);
oops::State<fv3jedi::Traits> xxSfcBkg(bkgGeom, sfcStateVars, currentCycle);
xxAtmBkg.read(atmBkgConfig);
xxSfcBkg.read(sfcBkgConfig);
xxSfcBkg.read(sfcBkgConfig);

// Initialize increments
oops::Increment<fv3jedi::Traits> dxAtm(incrGeom, atmIncrVars, currentCycle);
dxAtm.read(atmIncrConfig);

// Initialize ensemble mean analyses
oops::State<fv3jedi::Traits> xxAtmAnlEnsMean(anlEnsMeanGeom, atmIncrVars, currentCycle);
xxAtmAnlEnsMean.read(atmAnlEnsMeanConfig);

// Compute analyses
oops::State<fv3jedi::Traits> xxAtmAnl(bkgGeom, xxAtmBkg);
oops::State<fv3jedi::Traits> xxSfcAnl(bkgGeom, xxSfcBkg);
oops::State<fv3jedi::Traits> xxSfcAnl(bkgGeom, xxSfcBkg);
xxAtmAnl += dxAtm;

// Interpolate full resolution analyses to ensemble resolution and then change variables
oops::State<fv3jedi::Traits> xxAtmAnlEnsRes(incrCorGeom, oops::State<fv3jedi::Traits>(atmIncrVars, xxAtmAnl));

// Compute correction increments
oops::Increment<fv3jedi::Traits> dxAtmCor(incrCorGeom, atmIncrVars, xxAtmBkg.validTime());
dxAtmCor.diff(xxAtmAnlEnsMean, xxAtmAnlEnsRes);

// Write correction increment
dxAtmCor.write(atmIncrCorConfig);

// Write analyses
const oops::StructuredGridWriter<fv3jedi::Traits> atmGridWriter(atmAnlConfig, bkgGeom);
const oops::StructuredGridWriter<fv3jedi::Traits> sfcGridWriter(sfcAnlConfig, bkgGeom);
atmGridWriter.interpolateAndWrite(xxAtmAnl);
sfcGridWriter.interpolateAndWrite(xxSfcAnl);
sfcGridWriter.interpolateAndWrite(xxSfcAnl);
}

return 0;
Expand Down

0 comments on commit 42f2113

Please sign in to comment.