sync and remove gempak from noaacloud

NOAA-EPIC · Jul 12, 2024 · e8a2e0f · e8a2e0f
1 parent 24fe804
commit e8a2e0f
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 9 deletions.
diff --git a/modulefiles/module_base.noaacloud.lua b/modulefiles/module_base.noaacloud.lua
@@ -9,7 +9,6 @@ load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
 load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))
 load(pathJoin("python", (os.getenv("python_ver") or "None")))
 
-load(pathJoin("gempak", (os.getenv("gempak_ver") or "None")))
 load(pathJoin("jasper", (os.getenv("jasper_ver") or "None")))
 load(pathJoin("libpng", (os.getenv("libpng_ver") or "None")))
 load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))

diff --git a/sorc/gfs_utils.fd b/sorc/gfs_utils.fd
diff --git a/sorc/gsi_enkf.fd b/sorc/gsi_enkf.fd
diff --git a/sorc/gsi_monitor.fd b/sorc/gsi_monitor.fd
diff --git a/sorc/gsi_utils.fd b/sorc/gsi_utils.fd
diff --git a/sorc/ufs_utils.fd b/sorc/ufs_utils.fd
diff --git a/sorc/wxflow b/sorc/wxflow
diff --git a/versions/run.noaacloud.ver b/versions/run.noaacloud.ver
@@ -2,8 +2,6 @@ export stack_intel_ver=2021.3.0
 export stack_impi_ver=2021.3.0
 export spack_env=gsi-addon-env
 
-export gempak_ver=7.4.2
-
 source "${HOMEgfs:-}/versions/run.spack.ver"
 export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"
 

diff --git a/workflow/rocoto/tasks.py b/workflow/rocoto/tasks.py
@@ -241,6 +241,7 @@ def get_resource(self, task_name):
            #as below. Or, it won't run, but with an error:
            #"ufs_model.x: error while loading shared libraries: libiomp5.so: cannot open shared object file: No such file or directory"
            #Even the library path is clearly in LD_LIBRARY_PATH, or load exactly the modules when build ufs_model.x
+           #TODO: find a mechanism to provide native scheduler information.
             pw_csp = os.environ.get('PW_CSP', 'unknown')
             if ( pw_csp in ['aws', 'azure', 'google'] ):
                 native = '--export=ALL --exclusive'
+3 −8		modulefiles/gfsutils_orion.intel.lua
+3 −8		modulefiles/rdbfmsua_orion.intel.lua
+1 −8		ush/build.sh
+3 −3		ush/detect_machine.sh
+5 −6		ush/nc2grb/nc2grb.ice.sh
+3 −4		ush/nc2grb/nc2grb.ocean_2D.sh
+6 −7		ush/nc2grb/nc2grb.ocean_3D.sh
+0 −157		LICENSE.md
+1 −1		fix
+18 −8		modulefiles/gsi_gaea.intel.lua
+0 −25		modulefiles/gsi_noaacloud.intel.lua
+4 −5		modulefiles/gsi_orion.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
+26 −25		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
+3 −3		ush/detect_machine.sh
+3 −5		ush/module-setup.sh
+6 −6		ush/sub_gaea
+3 −5		ush/sub_orion
+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
+3 −8		modulefiles/orion.intel-run.lua
+3 −8		modulefiles/orion.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
+2 −2		ush/detect_machine.sh
+26 −8		ush/module-setup.sh
+3 −8		modulefiles/gsiutils_orion.intel.lua
+3 −3		ush/detect_machine.sh
+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
+1 −3		src/wxflow/configuration.py
+3 −0		tests/test_configuration.py