Skip to content

Commit

Permalink
Update to soca changes that significantly improve memory/runtime
Browse files Browse the repository at this point in the history
  • Loading branch information
Anna Shlyaeva committed Feb 20, 2025
1 parent dc15ca9 commit bf011d5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion sorc/soca
Submodule soca updated 36 files
+1 −1 external/icepack/Icepack
+21 −13 src/soca/AnalyticInit/soca_analytic_mod.F90
+27 −19 src/soca/Fields/Fields.cc
+1 −2 src/soca/Fields/Fields.h
+390 −752 src/soca/Fields/soca_fields_mod.F90
+17 −2 src/soca/Geometry/soca_geom_mod.F90
+59 −34 src/soca/Increment/Increment.cc
+1 −0 src/soca/Increment/Increment.h
+0 −1 src/soca/Increment/IncrementFortran.h
+0 −28 src/soca/Increment/soca_increment.interface.F90
+124 −87 src/soca/Increment/soca_increment_mod.F90
+8 −20 src/soca/LinearVariableChange/Balance/soca_balance_mod.F90
+4 −0 src/soca/LinearVariableChange/LinearModel2GeoVaLs/LinearModel2GeoVaLs.cc
+6 −3 src/soca/SaberBlocks/BkgErrFilt/BkgErrFilt.cc
+120 −16 src/soca/State/State.cc
+4 −0 src/soca/State/State.h
+0 −9 src/soca/State/StateFortran.h
+0 −103 src/soca/State/soca_state.interface.F90
+0 −137 src/soca/State/soca_state_mod.F90
+9 −4 src/soca/VariableChange/Model2GeoVaLs/Model2GeoVaLs.F90
+0 −2 src/soca/VariableChange/Soca2Cice/Soca2Cice.F90
+3 −1 src/soca/VariableChange/Soca2Cice/Soca2Cice.cc
+2 −3 src/soca/VariableChange/Soca2Cice/soca_ciceutils_mod.F90
+120 −86 src/soca/VariableChange/Soca2Cice/soca_soca2cice_mod.F90
+2 −1 src/soca/VariableChange/VariableChange.cc
+1 −9 test/CMakeLists.txt
+7 −4 test/testinput/3dhybfgat_pseudo.yml
+7 −4 test/testinput/4dvar_htlm.yml
+7 −4 test/testinput/4dvar_identity.yml
+0 −60 test/testinput/hofx_oasim_3d.yml
+7 −4 test/testinput/varchange_balance.yml
+7 −4 test/testinput/varchange_balance_TSSSH.yml
+12 −12 test/testref/3dhybfgat_pseudo.test
+7 −7 test/testref/4dvar_htlm.test
+2 −2 test/testref/4dvar_identity.test
+0 −26 test/testref/hofx_oasim_3d.test
7 changes: 3 additions & 4 deletions utils/soca/gdas_ens_handler.h
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,7 @@ namespace gdasapp {

// Save total ssh
oops::Log::info() << "ssh ensemble member " << i << std::endl;
soca::Increment ssh_tmp(geomOut, socaSshVar, postProcIncr.dt_);
ssh_tmp = ensMembers[i];
soca::Increment ssh_tmp(socaSshVar, ensMembers[i]);
sshTotal.push_back(ssh_tmp);

// Zero out ssh and other specified fields
Expand All @@ -242,8 +241,8 @@ namespace gdasapp {
// Compute the original steric height perturbation from T and S
eckit::LocalConfiguration stericConfig(fullConfig, "steric height");
postProcIncr.applyLinVarChange(incr, stericConfig, ensMeanTraj);
ssh_tmp = incr;
sshSteric.push_back(ssh_tmp);
soca::Increment ssh_tmp2(socaSshVar, incr);
sshSteric.push_back(ssh_tmp2);

// Compute unbalanced ssh
ssh_tmp = sshTotal[i];
Expand Down

0 comments on commit bf011d5

Please sign in to comment.