diff --git a/doc/source/BuildingRunningTesting/BuildRunLandDA.rst b/doc/source/BuildingRunningTesting/BuildRunLandDA.rst index daf48aa5..091f4d6e 100644 --- a/doc/source/BuildingRunningTesting/BuildRunLandDA.rst +++ b/doc/source/BuildingRunningTesting/BuildRunLandDA.rst @@ -91,7 +91,6 @@ To load the workflow environment, run: .. code-block:: console cd $LANDDAROOT/land-DA_workflow - source versions/build.ver_ module use modulefiles module load wflow_ conda activate land_da @@ -144,9 +143,9 @@ Data +-----------+--------------------------------------------------+ | Platform | Data Location | +===========+==================================================+ - | Hera | /scratch2/NAGAPE/epic/UFS_Land-DA/inputs | + | Hera | /scratch2/NAGAPE/epic/UFS_Land-DA_Dev/inputs | +-----------+--------------------------------------------------+ - | Orion | /work/noaa/epic/UFS_Land-DA/inputs | + | Orion | /work/noaa/epic/UFS_Land-DA_Dev/inputs | +-----------+--------------------------------------------------+ Users who have difficulty accessing the data on Hera or Orion may download it according to the instructions in :numref:`Section %s `. Its sub-directories are soft-linked to the ``fix`` directory of the land-DA workflow by the build script ``sorc/app_build.sh``. diff --git a/modulefiles/tasks/hera/task.plot_stats.lua b/modulefiles/tasks/hera/task.plot_stats.lua index f8fae562..92f6efa8 100644 --- a/modulefiles/tasks/hera/task.plot_stats.lua +++ b/modulefiles/tasks/hera/task.plot_stats.lua @@ -2,5 +2,14 @@ prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack")) load(pathJoin("stack-intel", stack_intel_ver)) load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver)) +load(pathJoin("stack-python", stack_python_ver)) load(pathJoin("prod_util", prod_util_ver)) +load(pathJoin("py-cartopy", py_cartopy_ver)) +load(pathJoin("py-matplotlib", py_matplotlib_ver)) +load(pathJoin("py-netcdf4", py_netcdf4_ver)) +load(pathJoin("py-numpy", py_numpy_ver)) +load(pathJoin("py-pyyaml", py_pyyaml_ver)) +load(pathJoin("py-scipy", py_scipy_ver)) +load(pathJoin("py-xarray", py_xarray_ver)) + diff --git a/modulefiles/tasks/orion/task.plot_stats.lua b/modulefiles/tasks/orion/task.plot_stats.lua index f8fae562..92f6efa8 100644 --- a/modulefiles/tasks/orion/task.plot_stats.lua +++ b/modulefiles/tasks/orion/task.plot_stats.lua @@ -2,5 +2,14 @@ prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack")) load(pathJoin("stack-intel", stack_intel_ver)) load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver)) +load(pathJoin("stack-python", stack_python_ver)) load(pathJoin("prod_util", prod_util_ver)) +load(pathJoin("py-cartopy", py_cartopy_ver)) +load(pathJoin("py-matplotlib", py_matplotlib_ver)) +load(pathJoin("py-netcdf4", py_netcdf4_ver)) +load(pathJoin("py-numpy", py_numpy_ver)) +load(pathJoin("py-pyyaml", py_pyyaml_ver)) +load(pathJoin("py-scipy", py_scipy_ver)) +load(pathJoin("py-xarray", py_xarray_ver)) + diff --git a/parm/conda_environment.yml b/parm/conda_environment.yml index 351a1302..53cb4899 100644 --- a/parm/conda_environment.yml +++ b/parm/conda_environment.yml @@ -6,9 +6,3 @@ dependencies: - pylint=2.17* - pytest=7.2* - uwtools=2.2.0 - - cartopy=0.23.* - - matplotlib=3.8.* - - netcdf4=1.6.* - - numpy=1.23.* - - scipy=1.10.* - - xarray=2022.11.* diff --git a/parm/task_load_modules_run_jjob.sh b/parm/task_load_modules_run_jjob.sh index dd6525d9..7622fc85 100755 --- a/parm/task_load_modules_run_jjob.sh +++ b/parm/task_load_modules_run_jjob.sh @@ -47,17 +47,5 @@ else echo "FATAL ERROR: task module file does not exist !!!" fi -# Load conda env for plotting task -if [ "${task_name}" = "plot_stats" ]; then - module unload python - module use ${home_dir}/modulefiles - module load conda - set +u - conda deactivate - conda activate land_da - conda list - set -u -fi - # Run J-job script ${home_dir}/jobs/JLANDDA_${task_name_upper} diff --git a/versions/run.ver_hera b/versions/run.ver_hera deleted file mode 120000 index 443f437e..00000000 --- a/versions/run.ver_hera +++ /dev/null @@ -1 +0,0 @@ -build.ver_hera \ No newline at end of file diff --git a/versions/run.ver_hera b/versions/run.ver_hera new file mode 100644 index 00000000..c7f80a33 --- /dev/null +++ b/versions/run.ver_hera @@ -0,0 +1,36 @@ +#!/bin/bash + +export modulepath_spack_stack="/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core" + +export bacio_ver="2.4.1" +export cmake_ver="3.23.1" +export crtm_ver="2.4.0.1" +export ecbuild_ver="3.7.2" +export esmf_ver="8.6.0" +export fms_ver="2023.04" +export gftl_shared_ver="1.6.1" +export g2_ver="3.4.5" +export g2tmpl_ver="1.10.2" +export hdf5_ver="1.14.0" +export ip_ver="4.3.0" +export jasper_ver="2.0.32" +export libpng_ver="1.6.37" +export mapl_ver="2.40.3-esmf-8.6.0" +export netcdf_c_ver="4.9.2" +export netcdf_fortran_ver="4.6.1" +export parallelio_ver="2.5.10" +export prod_util_ver="2.1.1" +export py_cartopy_ver="0.21.1" +export py_matplotlib_ver="3.7.3" +export py_netcdf4_ver="1.5.8" +export py_numpy_ver="1.22.3" +export py_pyyaml_ver="6.0" +export py_scipy_ver="1.11.3" +export py_xarray_ver="2023.7.0"export sp_ver="2.5.0" +export stack_intel_oneapi_mpi_ver="2021.5.1" +export stack_intel_ver="2021.5.0" +export stack_python_ver="3.10.13" +export ufs_pyenv_ver="1.0.0" +export w3emc_ver="2.10.0" +export zlib_ver="1.2.13" + diff --git a/versions/run.ver_orion b/versions/run.ver_orion deleted file mode 120000 index ba4830fa..00000000 --- a/versions/run.ver_orion +++ /dev/null @@ -1 +0,0 @@ -build.ver_orion \ No newline at end of file diff --git a/versions/run.ver_orion b/versions/run.ver_orion new file mode 100644 index 00000000..145d630c --- /dev/null +++ b/versions/run.ver_orion @@ -0,0 +1,37 @@ +#!/bin/bash + +export modulepath_spack_stack="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core" + +export bacio_ver="2.4.1" +export cmake_ver="3.23.1" +export crtm_ver="2.4.0.1" +export ecbuild_ver="3.7.2" +export esmf_ver="8.6.0" +export fms_ver="2023.04" +export gftl_shared_ver="1.6.1" +export g2_ver="3.4.5" +export g2tmpl_ver="1.10.2" +export hdf5_ver="1.14.0" +export ip_ver="4.3.0" +export jasper_ver="2.0.32" +export libpng_ver="1.6.37" +export mapl_ver="2.40.3-esmf-8.6.0" +export netcdf_c_ver="4.9.2" +export netcdf_fortran_ver="4.6.1" +export parallelio_ver="2.5.10" +export prod_util_ver="2.1.1" +export py_cartopy_ver="0.21.1" +export py_matplotlib_ver="3.7.3" +export py_netcdf4_ver="1.5.8" +export py_numpy_ver="1.22.3" +export py_pyyaml_ver="6.0" +export py_scipy_ver="1.11.3" +export py_xarray_ver="2023.7.0" +export sp_ver="2.5.0" +export stack_intel_oneapi_mpi_ver="2021.5.1" +export stack_intel_ver="2022.0.2" +export stack_python_ver="3.10.13" +export ufs_pyenv_ver="1.0.0" +export w3emc_ver="2.10.0" +export zlib_ver="1.2.13" +