Skip to content

Commit

Permalink
reverting back to wxflow develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Terry McGuinness committed Jun 28, 2024
1 parent 047a71b commit 5f9c85e
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci_uint_tests.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
sudo apt-get install -y perl libxml-libxml-perl libxml-libxslt-perl libdatetime-perl
python -m pip install --upgrade pip
pip install pytest
pip install wxflow git+https://github.com/NOAA-EMC/wxflow.git@config_env_bash
pip install wxflow
pip install wget
- name: Cache Rocoto Install
Expand Down
2 changes: 1 addition & 1 deletion sorc/gdas.cd
Submodule gdas.cd updated 61 files
+0 −19 README.md
+1 −1 build.sh
+4 −25 ci/driver.sh
+2 −27 ci/gw_driver.sh
+2 −2 ci/hera.sh
+3 −0 modulefiles/GDAS/gaea.intel.lua
+6 −3 modulefiles/GDAS/hera.intel.lua
+3 −3 modulefiles/GDAS/hercules.intel.lua
+3 −0 modulefiles/GDAS/noaacloud.intel.lua
+12 −13 modulefiles/GDAS/orion.intel.lua
+2 −2 modulefiles/GDAS/wcoss2.intel.lua
+5 −8 parm/aero/berror/aero_diffusionparm.yaml.j2
+0 −33 parm/aero/berror/staticb_diffusion.yaml.j2
+57 −49 parm/atm/jcb-base.yaml.j2
+1 −1 parm/atm/jcb-prototype_lgetkf.yaml.j2
+356 −0 parm/atm/obs/config/satwind_modis_aqua.yaml.j2
+368 −0 parm/atm/obs/config/satwind_modis_terra.yaml.j2
+289 −0 parm/atm/obs/config/satwind_viirs_n20.yaml.j2
+289 −0 parm/atm/obs/config/satwind_viirs_npp.yaml.j2
+1 −1 parm/jcb-algorithms
+1 −1 parm/jcb-gdas
+0 −137 parm/snow/jcb-base.yaml.j2
+0 −7 parm/snow/jcb-fv3jedi_land_ensrecenter.yaml.j2
+0 −10 parm/snow/letkfoi/ens_apply_incr_nml.j2
+0 −5 parm/soca/marine-jcb-3dfgat.yaml.j2
+0 −72 parm/soca/marine-jcb-base.yaml
+2 −68 scripts/exgdas_global_marine_analysis_prep.py
+3 −13 scripts/exgdas_global_marine_analysis_vrfy.py
+1 −1 sorc/jcb
+0 −9 test/aero/genyaml_3dvar.sh
+1 −1 test/aero/global-workflow/jjob_var_final.sh
+2 −2 test/aero/global-workflow/jjob_var_init.sh
+1 −1 test/aero/global-workflow/jjob_var_run.sh
+2 −2 test/atm/global-workflow/jcb-prototype_3dvar.yaml.j2
+2 −2 test/atm/global-workflow/jcb-prototype_lgetkf.yaml.j2
+1 −1 test/atm/global-workflow/jjob_ens_final.sh
+1 −1 test/atm/global-workflow/jjob_ens_inc.sh
+3 −3 test/atm/global-workflow/jjob_ens_init.sh
+1 −1 test/atm/global-workflow/jjob_ens_run.sh
+1 −1 test/atm/global-workflow/jjob_var_final.sh
+1 −1 test/atm/global-workflow/jjob_var_inc.sh
+5 −5 test/atm/global-workflow/jjob_var_init.sh
+1 −1 test/atm/global-workflow/jjob_var_run.sh
+1 −1 test/snow/apply_jedi_incr.sh
+1 −1 test/snow/create_bkg_ens.sh
+1 −1 test/snow/letkfoi_snowda.sh
+1 −1 test/snow/test_imsproc.sh
+17 −6 test/soca/gw/CMakeLists.txt
+11 −11 test/soca/gw/prep.sh
+0 −9 test/soca/socaincr2mom6.sh
+3 −3 ush/eva/marine_gdas_plots.yaml
+4 −1 ush/examples/run_scripts/soca1deg.yaml
+45 −0 ush/soca/examples/run_jjobs_container.yaml
+50 −0 ush/soca/examples/run_jjobs_hera.yaml
+50 −0 ush/soca/examples/run_jjobs_hera_025.yaml
+57 −57 ush/soca/marine_recenter.py
+29 −29 ush/soca/prep_ocean_obs.py
+4 −4 ush/soca/prep_ocean_obs_utils.py
+7 −6 ush/soca/run_jjobs.py
+33 −94 ush/soca/soca_vrfy.py
+3 −3 utils/soca/gdas_soca_diagb.h
2 changes: 1 addition & 1 deletion sorc/gfs_utils.fd
Submodule gfs_utils.fd updated 3 files
+5 −6 ush/nc2grb/nc2grb.ice.sh
+3 −4 ush/nc2grb/nc2grb.ocean_2D.sh
+6 −7 ush/nc2grb/nc2grb.ocean_3D.sh
2 changes: 1 addition & 1 deletion sorc/gsi_enkf.fd
Submodule gsi_enkf.fd updated 21 files
+0 −157 LICENSE.md
+1 −1 fix
+18 −8 modulefiles/gsi_gaea.intel.lua
+0 −25 modulefiles/gsi_noaacloud.intel.lua
+4 −10 regression/CMakeLists.txt
+3 −7 regression/global_4denvar.sh
+3 −3 regression/global_enkf.sh
+4 −4 regression/multi_regression.sh
+207 −0 regression/netcdf_fv3_regional.sh
+1 −1 regression/regression_driver.sh
+134 −176 regression/regression_namelists.sh
+141 −58 regression/regression_namelists_db.sh
+29 −29 regression/regression_param.sh
+23 −76 regression/regression_test_enkf.sh
+22 −18 regression/regression_var.sh
+30 −151 regression/rrfs_3denvar_glbens.sh
+0 −223 regression/rrfs_enkf_conv.sh
+2 −2 src/gsi/read_radar.f90
+1 −1 ush/detect_machine.sh
+3 −5 ush/module-setup.sh
+6 −6 ush/sub_gaea
2 changes: 1 addition & 1 deletion sorc/gsi_monitor.fd
Submodule gsi_monitor.fd updated 7 files
+0 −18 modulefiles/gaea.intel-run.lua
+0 −16 modulefiles/gaea.intel.lua
+0 −18 modulefiles/noaacloud-run.intel.lua
+0 −16 modulefiles/noaacloud.intel.lua
+4 −4 src/Conventional_Monitor/image_gen/ush/mk_horz_hist.sh
+2 −30 src/Conventional_Monitor/nwprod/conmon_shared/sorc/conmon_time.fd/stas2ctl.f90
+26 −8 ush/module-setup.sh
2 changes: 1 addition & 1 deletion sorc/ufs_model.fd
Submodule ufs_model.fd updated 82 files
+1 −1 CDEPS-interface/CDEPS
+0 −1 CDEPS-interface/cdeps_files.cmake
+1 −1 CICE-interface/CICE
+1 −7 CICE-interface/CMakeLists.txt
+0 −19 CICE-interface/cice_files.cmake
+2 −3 CMakeLists.txt
+1 −1 FV3
+1 −1 HYCOM-interface/HYCOM
+0 −15 cmake/configure_apps.cmake
+0 −1 cmake/configure_noaacloud.intel.cmake
+3 −1 doc/UsersGuide/requirements.txt
+2 −3 doc/UsersGuide/source/CodeOverview.rst
+0 −20 driver/UFSDriver.F90
+3 −3 modulefiles/ufs_derecho.gnu.lua
+3 −3 modulefiles/ufs_derecho.intel.lua
+7 −6 modulefiles/ufs_gaea.intel.lua
+0 −3 modulefiles/ufs_jet.intel.lua
+3 −3 modulefiles/ufs_orion.intel.lua
+9 −7 modulefiles/ufs_wcoss2.intel.lua
+1 −1 tests/bl_date.conf
+2 −20 tests/default_vars.sh
+1 −2 tests/detect_machine.sh
+2 −5 tests/fv3_conf/control_run.IN
+0 −15 tests/fv3_conf/cpld_docn_dice.IN
+0 −4 tests/fv3_conf/cpld_docn_pcice.IN
+7 −86 tests/fv3_conf/wam_run.IN
+0 −545 tests/logs/OpnReqTests_atm_ds2s_docn_dice_hera.log
+0 −545 tests/logs/OpnReqTests_atm_ds2s_docn_pcice_hera.log
+24 −24 tests/logs/OpnReqTests_control_p8_hera.log
+12 −12 tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
+15 −15 tests/logs/OpnReqTests_regional_control_hera.log
+264 −267 tests/logs/RegressionTests_acorn.log
+272 −282 tests/logs/RegressionTests_derecho.log
+274 −280 tests/logs/RegressionTests_gaea.log
+550 −372 tests/logs/RegressionTests_hera.log
+461 −375 tests/logs/RegressionTests_hercules.log
+245 −251 tests/logs/RegressionTests_jet.log
+277 −282 tests/logs/RegressionTests_orion.log
+232 −235 tests/logs/RegressionTests_wcoss2.log
+7 −4 tests/module-setup.sh
+0 −38 tests/parm/diag_table/diag_additional_ldiag3d_ugwp
+10 −19 tests/parm/diag_table/diag_table_wam
+1 −1 tests/parm/docn_in.IN
+13 −23 tests/parm/field_table/field_table_wam
+0 −15 tests/parm/global_dice.streams.IN
+0 −13 tests/parm/global_dice_in.IN
+0 −15 tests/parm/global_docn.streams.IN
+0 −12 tests/parm/global_docn_in.IN
+1 −13 tests/parm/ice_in.IN
+0 −396 tests/parm/input_global_nest.nml.IN
+0 −406 tests/parm/input_global_parent.nml.IN
+0 −53 tests/parm/model_configure_gnv1.IN
+0 −1 tests/parm/ufs.configure.datm_cdeps.IN
+0 −1 tests/parm/ufs.configure.hafs_atm_docn.IN
+0 −1 tests/parm/ufs.configure.hafs_atm_ocn.IN
+0 −1 tests/parm/ufs.configure.hafs_atm_ocn_wav.IN
+0 −1 tests/parm/ufs.configure.hafs_atm_ocn_wav_inline.IN
+0 −1 tests/parm/ufs.configure.hafs_atm_ocn_wav_mom6.IN
+0 −1 tests/parm/ufs.configure.hafs_atm_wav.IN
+0 −1 tests/parm/ufs.configure.s2s.IN
+0 −1 tests/parm/ufs.configure.s2s_aoflux_esmf.IN
+0 −5 tests/parm/ufs.configure.s2s_esmf.IN
+0 −1 tests/parm/ufs.configure.s2sa.IN
+0 −1 tests/parm/ufs.configure.s2sa_esmf.IN
+0 −1 tests/parm/ufs.configure.s2sw.IN
+0 −1 tests/parm/ufs.configure.s2sw_esmf.IN
+0 −1 tests/parm/ufs.configure.s2sw_fast_esmf.IN
+0 −1 tests/parm/ufs.configure.s2swa.IN
+0 −1 tests/parm/ufs.configure.s2swa_esmf.IN
+0 −1 tests/parm/ufs.configure.s2swa_fast_esmf.IN
+331 −0 tests/parm/wam.nml.IN
+0 −434 tests/parm/wam_v17.nml.IN
+7 −13 tests/rt.conf
+4 −3 tests/rt.sh
+0 −9 tests/run_test.sh
+37 −2 tests/test_changes.list
+0 −121 tests/tests/atm_ds2s_docn_dice
+0 −128 tests/tests/atm_ds2s_docn_pcice
+26 −91 tests/tests/control_wam
+30 −94 tests/tests/control_wam_debug
+0 −1 tests/tests/cpld_control_nowave_noaero_p8
+178 −293 tests/tests/gnv1_nested
2 changes: 1 addition & 1 deletion sorc/ufs_utils.fd
Submodule ufs_utils.fd updated 52 files
+0 −2 CMakeLists.txt
+7 −11 docs/main.md
+3 −3 modulefiles/build.orion.intel.lua
+9 −7 reg_tests/cpld_gridgen/rt.conf
+11 −1 reg_tests/cpld_gridgen/rt.sh
+6 −2 reg_tests/ice_blend/driver.orion.sh
+0 −34 reg_tests/ocnice_prep/RegressionTests_hera.intel.log
+0 −34 reg_tests/ocnice_prep/RegressionTests_hercules.intel.log
+0 −34 reg_tests/ocnice_prep/RegressionTests_jet.intel.log
+0 −34 reg_tests/ocnice_prep/RegressionTests_orion.intel.log
+0 −34 reg_tests/ocnice_prep/RegressionTests_wcoss2.intel.log
+0 −52 reg_tests/ocnice_prep/parm/ice.csv
+0 −8 reg_tests/ocnice_prep/parm/ocean.csv
+0 −8 reg_tests/ocnice_prep/parm/ocniceprep.nml.IN
+0 −10 reg_tests/ocnice_prep/rt.conf
+0 −325 reg_tests/ocnice_prep/rt.sh
+1 −21 reg_tests/rt.sh
+2 −2 reg_tests/snow2mdl/driver.orion.sh
+1 −3 sorc/CMakeLists.txt
+1 −1 sorc/cpld_gridgen.fd/docs/Doxyfile.in
+ − sorc/cpld_gridgen.fd/docs/_static/murray.png
+47 −149 sorc/cpld_gridgen.fd/docs/cpld_gridgen.md
+40 −36 sorc/cpld_gridgen.fd/gen_fixgrid.F90
+26 −2 sorc/cpld_gridgen.fd/postwgts.F90
+9 −12 sorc/machine-setup.sh
+0 −44 sorc/ocnice_prep.fd/CMakeLists.txt
+0 −121 sorc/ocnice_prep.fd/arrays_mod.F90
+0 −16 sorc/ocnice_prep.fd/docs/CMakeLists.txt
+0 −2,573 sorc/ocnice_prep.fd/docs/Doxyfile.in
+0 −3 sorc/ocnice_prep.fd/docs/README.md
+0 −135 sorc/ocnice_prep.fd/docs/ocnice_prep.md
+0 −246 sorc/ocnice_prep.fd/init_mod.F90
+0 −114 sorc/ocnice_prep.fd/ocncalc_mod.F90
+0 −360 sorc/ocnice_prep.fd/ocniceprep.F90
+0 −229 sorc/ocnice_prep.fd/restarts_mod.F90
+0 −515 sorc/ocnice_prep.fd/utils_esmf_mod.F90
+0 −723 sorc/ocnice_prep.fd/utils_mod.F90
+1 −2 tests/CMakeLists.txt
+0 −40 tests/ocnice_prep/CMakeLists.txt
+0 −2 tests/ocnice_prep/LSanSuppress.supp
+0 −52 tests/ocnice_prep/data/ice.badvecgrid.csv
+0 −52 tests/ocnice_prep/data/ice.badvecpairs.csv
+0 −8 tests/ocnice_prep/data/invalid.dst5p00.nml
+0 −8 tests/ocnice_prep/data/invalid.dstdim.nml
+0 −8 tests/ocnice_prep/data/invalid.model.nml
+0 −8 tests/ocnice_prep/data/invalid.srcdim.nml
+0 −8 tests/ocnice_prep/data/ocean.badvecgrid.csv
+0 −8 tests/ocnice_prep/data/ocean.badvecpairs.csv
+0 −71 tests/ocnice_prep/ftst_program_setup.F90
+1 −0 ush/cpld_gridgen.sh
+0 −49 ush/ocnice_prep.sh
+1 −1 util/gdas_init/copy_coldstart_files.sh
2 changes: 1 addition & 1 deletion sorc/verif-global.fd
Submodule verif-global.fd updated 5 files
+0 −61 modulefiles/emc_verif_global_s4.lua
+23 −2 ush/load_modules.sh
+1 −1 ush/plotting_scripts/plot_maps2d_lat_lon_errors.py
+1 −1 ush/plotting_scripts/plot_maps2d_model2obs_calc_vars_lat_lon_errors.py
+1 −1 ush/plotting_scripts/plot_mapsda_lat_lon_errors.py
2 changes: 1 addition & 1 deletion sorc/wxflow
Submodule wxflow updated 0 files

0 comments on commit 5f9c85e

Please sign in to comment.