Skip to content

Commit

Permalink
Initial test upgrade to spack-stack 1.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidHuber-NOAA committed Sep 9, 2024
1 parent 336b78a commit 8a9efa7
Show file tree
Hide file tree
Showing 12 changed files with 32 additions and 33 deletions.
2 changes: 1 addition & 1 deletion sorc/gdas.cd
Submodule gdas.cd updated 69 files
+4 −0 .gitmodules
+1 −0 bundle/CMakeLists.txt
+22 −23 modulefiles/GDAS/hera.intel.lua
+12 −0 parm/aero/variational/3dvar_fgat_gfs_aero.yaml.j2
+12 −0 parm/aero/variational/3dvar_gfs_aero.yaml.j2
+4 −0 parm/atm/jcb-base.yaml.j2
+21 −4 parm/atm/jcb-prototype_3dvar.yaml.j2
+24 −4 parm/atm/jcb-prototype_lgetkf.yaml.j2
+46 −0 parm/atm/jcb-prototype_lgetkf_observer.yaml.j2
+49 −0 parm/atm/jcb-prototype_lgetkf_solver.yaml.j2
+0 −0 parm/ioda/bufr2ioda/bufr2ioda_gnssro.json
+0 −11 parm/ioda/bufr2ioda/bufr2ioda_gpsro_bufr_combined.json
+3 −2 parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_ahi.json
+2 −0 parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_seviri.json
+1 −1 parm/jcb-algorithms
+1 −1 parm/jcb-gdas
+5 −5 parm/snow/hofx/hofx_nomodel.yaml.j2
+1 −1 parm/snow/jcb-base.yaml.j2
+2 −2 parm/snow/letkfoi/apply_incr_nml.j2
+6 −6 parm/snow/letkfoi/letkfoi.yaml.j2
+2 −2 parm/snow/obs/config/adpsfc_snow.yaml.j2
+2 −2 parm/snow/obs/config/ghcn_snow.yaml.j2
+2 −2 parm/snow/obs/config/ims_snow.yaml.j2
+109 −0 parm/snow/obs/config/sfcsno_snow.yaml.j2
+2 −2 parm/snow/obs/config/snocvr_snow.yaml.j2
+1 −1 parm/snow/obs/lists/gdas_snow.yaml.j2
+3 −3 parm/snow/prep/fims.nml.j2
+3 −3 parm/snow/prep/prep_gts.yaml.j2
+1 −0 parm/soca/marine-jcb-base.yaml
+25 −0 parm/soca/soca_fix_stage_100.yaml.j2
+2 −0 parm/soca/variational/3dvarfgat.yaml
+1 −0 sorc/da-utils
+4 −0 test/atm/global-workflow/3dvar.ref
+17 −2 test/atm/global-workflow/CMakeLists.txt
+8 −1 test/atm/global-workflow/config.yaml
+34 −0 test/atm/global-workflow/jcb-prototype_lgetkf_observer.yaml.j2
+34 −0 test/atm/global-workflow/jcb-prototype_lgetkf_solver.yaml.j2
+1 −1 test/atm/global-workflow/jjob_ens_inc.sh
+4 −0 test/atm/global-workflow/jjob_ens_init.sh
+122 −0 test/atm/global-workflow/jjob_ens_init_split.sh
+3 −0 test/atm/global-workflow/jjob_ens_letkf.sh
+59 −0 test/atm/global-workflow/jjob_ens_obs.sh
+59 −0 test/atm/global-workflow/jjob_ens_sol.sh
+111 −0 test/atm/global-workflow/lgetkf_observer.ref
+165 −0 test/atm/global-workflow/lgetkf_solver.ref
+5 −0 test/atm/global-workflow/setup_workflow_exp.sh
+83 −0 test/testinput/bufr_sfcsno_snow.yaml
+2 −2 ush/eva/gen_eva_obs_yaml.py
+1 −1 ush/ioda/bufr2ioda/bufr2ioda_acft_profiles_prepbufr.py
+1 −1 ush/ioda/bufr2ioda/bufr2ioda_adpsfc_prepbufr.py
+34 −1 ush/ioda/bufr2ioda/bufr2ioda_adpupa.py
+1 −1 ush/ioda/bufr2ioda/bufr2ioda_adpupa_prepbufr.py
+1 −1 ush/ioda/bufr2ioda/bufr2ioda_conventional_prepbufr_ps.py
+1 −1 ush/ioda/bufr2ioda/bufr2ioda_gnssro.py
+0 −593 ush/ioda/bufr2ioda/bufr2ioda_gpsro_bufr_combined.py
+1 −1 ush/ioda/bufr2ioda/bufr2ioda_sfcshp_prepbufr.py
+1 −1 ush/ioda/bufr2ioda/bufr2ioda_snocvr_bufr.py
+2 −2 ush/run_satbias_conv.py
+92 −24 ush/ufoeval/run_ufo_hofx_test.sh
+2 −2 ush/ufoeval/test_yamls.sh
+125 −0 utils/obsproc/IcecJpssrr2Ioda.h
+4 −0 utils/obsproc/applications/gdas_obsprovider2ioda.h
+5 −0 utils/soca/gdassoca_obsstats.h
+9 −0 utils/test/CMakeLists.txt
+2 −0 utils/test/prepdata.sh
+724 −0 utils/test/testdata/icec_jrr_n20_1.cdl
+783 −0 utils/test/testdata/icec_jrr_n20_2.cdl
+13 −0 utils/test/testinput/gdas_icecjpssrr2ioda.yaml
+26 −0 utils/test/testref/icecjpssrr2ioda.test
2 changes: 1 addition & 1 deletion sorc/gsi_enkf.fd
Submodule gsi_enkf.fd updated 46 files
+1 −1 fix
+2 −2 modulefiles/gsi_common.lua
+3 −3 modulefiles/gsi_hera.intel.lua
+2 −2 modulefiles/gsi_jet.intel.lua
+0 −3 regression/global_enkf.sh
+4 −4 regression/regression_namelists.sh
+1 −1 regression/regression_namelists_db.sh
+2 −2 regression/regression_param.sh
+0 −6 src/enkf/gridio_gfs.f90
+1 −1 src/gsi/CMakeLists.txt
+9 −7 src/gsi/convinfo.f90
+1 −1 src/gsi/correlated_obsmod.F90
+342 −18 src/gsi/crtm_interface.f90
+1 −1 src/gsi/deter_sfc_mod.f90
+130 −47 src/gsi/general_read_gfsatm.f90
+6 −0 src/gsi/gsi_files.cmake
+161 −0 src/gsi/gsi_gnssrspdOper.F90
+10 −2 src/gsi/gsi_obOperTypeManager.F90
+3 −1 src/gsi/gsimain.f90
+1 −1 src/gsi/gsimod.F90
+239 −0 src/gsi/intgnssrspd.f90
+3 −2 src/gsi/intjo.f90
+257 −0 src/gsi/m_gnssrspdNode.F90
+14 −1 src/gsi/m_obsNodeTypeManager.F90
+3 −1 src/gsi/m_rhs.F90
+5 −2 src/gsi/mrmsmod.f90
+23 −5 src/gsi/netcdfgfs_io.f90
+9 −5 src/gsi/obsmod.F90
+1 −1 src/gsi/oneobmod.F90
+61 −3 src/gsi/prt_guess.f90
+1 −1 src/gsi/qcmod.f90
+2 −2 src/gsi/radinfo.f90
+49 −40 src/gsi/read_cris.f90
+5 −3 src/gsi/read_diag.f90
+463 −0 src/gsi/read_gnssrspd.f90
+46 −35 src/gsi/read_iasi.f90
+49 −32 src/gsi/read_obs.F90
+4 −4 src/gsi/read_prepbufr.f90
+1 −1 src/gsi/read_viirs.f90
+1 −1 src/gsi/set_crtm_cloudmod.f90
+940 −0 src/gsi/setupgnssrspd.f90
+3 −2 src/gsi/setuprhsall.f90
+50 −5 src/gsi/statsconv.f90
+3 −3 src/gsi/statsrad.f90
+175 −0 src/gsi/stpgnssrspd.f90
+2 −2 src/mgbf/mg_input.f90
2 changes: 1 addition & 1 deletion sorc/ufs_model.fd
Submodule ufs_model.fd updated 158 files
2 changes: 1 addition & 1 deletion versions/build.hera.ver
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ export stack_intel_ver=2021.5.0
export stack_impi_ver=2021.5.1
export spack_env=gsi-addon-dev-rocky8
source "${HOMEgfs:-}/versions/build.spack.ver"
export spack_mod_path="/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
export spack_mod_path="/scratch1/NCEPDEV/global/David.Huber/SPACK/ss_1.8.0/envs/gsi-addon/install/modulefiles/Core"
25 changes: 12 additions & 13 deletions versions/build.spack.ver
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
export spack_stack_ver=1.6.0
export spack_stack_ver=1.8.0

export cmake_ver=3.23.1
export cmake_ver=3.27.9

export jasper_ver=2.0.32
export libpng_ver=1.6.37
export zlib_ver=1.2.13
export esmf_ver=8.5.0
export fms_ver=2023.02.01
export zlib_ver=2.1.6
export esmf_ver=8.6.1
export fms_ver=2024.02

export hdf5_ver=1.14.0
export hdf5_ver=1.14.3
export netcdf_c_ver=4.9.2
export netcdf_fortran_ver=4.6.1

export bacio_ver=2.4.1
export nemsio_ver=2.5.4
export sigio_ver=2.3.2
export w3emc_ver=2.10.0
export bufr_ver=11.7.0
export g2_ver=3.4.5
export sp_ver=2.5.0
export ip_ver=4.3.0
export bufr_ver=12.1.0
export g2_ver=3.5.1
export ip_ver=5.0.0
export gsi_ncdiag_ver=1.1.2
export g2tmpl_ver=1.10.2
export g2tmpl_ver=1.13.0
export crtm_ver=2.4.0.1
export wgrib2_ver=2.0.8
export grib_util_ver=1.3.0
export wgrib2_ver=3.1.1
export grib_util_ver=1.4.0
2 changes: 1 addition & 1 deletion versions/run.hera.ver
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ export gempak_ver=7.17.0
export perl_ver=5.38.0

source "${HOMEgfs:-}/versions/run.spack.ver"
export spack_mod_path="/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
export spack_mod_path="/scratch1/NCEPDEV/global/David.Huber/SPACK/ss_1.8.0/envs/gsi-addon/install/modulefiles/Core"
20 changes: 10 additions & 10 deletions versions/run.spack.ver
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
export spack_stack_ver=1.6.0
export python_ver=3.11.6
export spack_stack_ver=1.8.0
export python_ver=3.11.7

export jasper_ver=2.0.32
export libpng_ver=1.6.37
export cdo_ver=2.2.0
export nco_ver=5.0.6
export cdo_ver=2.3.0
export nco_ver=5.1.6

export hdf5_ver=1.14.0
export hdf5_ver=1.14.3
export netcdf_c_ver=4.9.2
export netcdf_fortran_ver=4.6.1

export bufr_ver=11.7.0
export bufr_ver=12.1.0
export gsi_ncdiag_ver=1.1.2
export g2tmpl_ver=1.10.2
export g2tmpl_ver=1.13.0
export crtm_ver=2.4.0.1
export wgrib2_ver=2.0.8
export grib_util_ver=1.3.0
export wgrib2_ver=3.1.1
export grib_util_ver=1.4.0
export prod_util_ver=2.1.1
export py_netcdf4_ver=1.5.8
export py_pyyaml_ver=6.0
export py_pyyaml_ver=6.0.1
export py_jinja2_ver=3.1.2
export py_pandas_ver=1.5.3
export py_python_dateutil_ver=2.8.2
Expand Down

0 comments on commit 8a9efa7

Please sign in to comment.