Merge branch 'develop' into feature/prod_groups

NOAA-EMC · Jan 8, 2025 · d66e3c0 · d66e3c0
2 parents f0444d5 + 673470a
commit d66e3c0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/env/WCOSS2.env b/env/WCOSS2.env
@@ -123,7 +123,7 @@ elif [[ "${step}" = "marineanlchkpt" ]]; then
 elif [[ "${step}" = "ocnanalecen" ]]; then
 
     export NTHREADS_OCNANALECEN=${NTHREADSmax}
-    export APRUN_OCNANALECEN="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANALECEN}"
+    export APRUN_OCNANALECEN="${APRUN_default}"
 
 elif [[ "${step}" = "marineanlletkf" ]]; then
 

diff --git a/sorc/gsi_enkf.fd b/sorc/gsi_enkf.fd
diff --git a/versions/fix.ver b/versions/fix.ver
@@ -15,7 +15,7 @@ export gdas_obs_ver=20240213
 export gdas_aero_ver=20240806
 export gdas_snow_ver=20241210
 export glwu_ver=20220805
-export gsi_ver=20240208
+export gsi_ver=20241022
 export lut_ver=20220805
 export mom6_ver=20240416
 export orog_ver=20231027
+9 −10		.github/workflows/gcc.yml
+10 −6		.github/workflows/intel.yml
+30 −0		ci/spack_gcc.yaml
+4 −2		ci/spack_intel.yaml
+1 −1		fix
+54 −0		modulefiles/gsi_acorn.intel.lua
+28 −0		modulefiles/gsi_container.intel.lua
+4 −8		modulefiles/gsi_gaeac5.intel.lua
+29 −0		modulefiles/gsi_gaeac6.intel.lua
+1 −1		modulefiles/gsi_hera.gnu.lua
+1 −1		modulefiles/gsi_hera.intel.lua
+1 −1		modulefiles/gsi_hercules.intel.lua
+1 −1		modulefiles/gsi_jet.intel.lua
+1 −1		modulefiles/gsi_noaacloud.intel.lua
+1 −1		modulefiles/gsi_orion.intel.lua
+1 −1		modulefiles/gsi_s4.intel.lua
+1 −1		modulefiles/gsi_wcoss2.intel.lua
+1 −0		regression/global_enkf.sh
+1 −1		regression/regression_driver.sh
+1 −1		regression/regression_namelists.sh
+70 −32		regression/regression_param.sh
+22 −6		regression/regression_var.sh
+8 −0		src/enkf/controlvec.f90
+0 −2		src/enkf/enkf_files.cmake
+1 −1		src/enkf/enkf_obs_sensitivity.f90
+1 −1		src/enkf/gridio_gfs.f90
+1 −1		src/enkf/innovstats.f90
+16 −1		src/enkf/observer_fv3reg.f90
+0 −1		src/enkf/observer_nmmb.f90
+0 −1		src/enkf/observer_wrf.f90
+5 −1		src/gsi/CMakeLists.txt
+2 −0		src/gsi/calc_fov_crosstrk.f90
+13 −3		src/gsi/clw_mod.f90
+2 −0		src/gsi/cmake/PackageConfig.cmake.in
+5 −5		src/gsi/combine_radobs.f90
+19 −0		src/gsi/crtm_interface.f90
+0 −3		src/gsi/glbsoi.f90
+2 −0		src/gsi/gsi_files.cmake
+2 −0		src/gsi/gsi_obOperTypeManager.F90
+7 −6		src/gsi/gsimod.F90
+401 −108		src/gsi/m_berror_stats.f90
+699 −0		src/gsi/m_nc_berror.f90
+100 −65		src/gsi/ncepnems_io.f90
+1 −1		src/gsi/obsmod.F90
+33 −14		src/gsi/qcmod.f90
+2 −1		src/gsi/radiance_mod.f90
+9 −8		src/gsi/radinfo.f90
+1 −0		src/gsi/read_avhrr_navy.f90
+1 −1		src/gsi/read_bufrtovs.f90
+1 −1		src/gsi/read_cris.f90
+0 −1		src/gsi/read_gmi.f90
+9 −12		src/gsi/read_iasi.f90
+953 −0		src/gsi/read_iasing.f90
+21 −6		src/gsi/read_obs.F90
+1 −2		src/gsi/read_saphir.f90
+7 −6		src/gsi/setuprad.f90
+1 −1		src/gsi/statsrad.f90
+17 −8		ush/detect_machine.sh
+9 −2		ush/module-setup.sh
+1 −0		ush/sub_acorn
+3 −3		ush/sub_gaeac5
+170 −0		ush/sub_gaeac6
+3 −3		ush/sub_wcoss2