From 2e5b4bc45c4465925984bdd204508cbc2493bfa3 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Thu, 12 Oct 2023 12:41:13 -0600 Subject: [PATCH 01/20] Add new module for building SCM on Derecho --- scm/etc/modules/derecho_intel.lua | 47 +++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 scm/etc/modules/derecho_intel.lua diff --git a/scm/etc/modules/derecho_intel.lua b/scm/etc/modules/derecho_intel.lua new file mode 100644 index 000000000..d577090f4 --- /dev/null +++ b/scm/etc/modules/derecho_intel.lua @@ -0,0 +1,47 @@ +help([[ +This module loads libraries for building the CCPP Single-Column Model on +the CISL machine Derecho (Cray) using Intel-classic-2023.0.0 +]]) + +whatis([===[Loads libraries needed for building the CCPP SCM on Derecho ]===]) + +load(pathJoin("cmake", os.getenv("cmake_ver") or "3.26.3")) +load(pathJoin("ncarenv", os.getenv("ncarenv_ver") or "23.06")) +load(pathJoin("craype", os.getenv("craype_ver") or "2.7.20")) + +unload("netcdf") +unload("hdf5") +load(pathJoin("intel-classic", os.getenv("intel_classic_ver") or "2023.0.0")) +load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver") or "8.1.25")) + +prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/derecho/hpc-stack/intel-classic-2023.0.0/modulefiles/stack") +load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0")) +load(pathJoin("hpc-intel-classic", os.getenv("hpc_intel_classic_ver") or "2023.0.0")) +load(pathJoin("hpc-cray-mpich", os.getenv("hpc_cray_mpich_ver") or "8.1.25")) + +load(pathJoin("ncarcompilers", os.getenv("ncarcompilers_ver") or "1.0.0")) + +load_any("netcdf/4.9.2","netcdf-c/4.9.2") +load_any("netcdf/4.9.2","netcdf-fortran/4.6.0") + +load("bacio/2.4.1") +load("sp/2.3.3") +load("w3emc/2.9.2") + +setenv("CC","cc") +setenv("FC","ftn") +setenv("CXX","CC") + +setenv("CMAKE_C_COMPILER","cc") +setenv("CMAKE_CXX_COMPILER","CC") +setenv("CMAKE_Fortran_COMPILER","ftn") +setenv("CMAKE_Platform","derecho.intel") + +load("conda/latest") + +if mode() == "load" then + LmodMsgRaw([===[Please do the following to activate conda environment: + > conda activate /glade/p/ral/jntp/GMTB/CCPP_SCM/conda/ccpp-scm +]===]) +end + From 1e34ae92bdbf4f873965f0d2b358edc5d34b07a3 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Wed, 8 Nov 2023 16:46:05 +0000 Subject: [PATCH 02/20] Add hera module file --- scm/etc/modules/hera_intel.lua | 46 ++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 scm/etc/modules/hera_intel.lua diff --git a/scm/etc/modules/hera_intel.lua b/scm/etc/modules/hera_intel.lua new file mode 100644 index 000000000..beb63bad8 --- /dev/null +++ b/scm/etc/modules/hera_intel.lua @@ -0,0 +1,46 @@ +help([[ +This module loads libraries for building the CCPP Single-Column Model on +the NOAA RDHPC machine Hera using Intel-2022.1.2 +]]) + +whatis([===[Loads libraries needed for building the CCPP SCM on Hera ]===]) + +prepend_path("MODULEPATH","/contrib/sutils/modulefiles") +load("sutils") + +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core") + +stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" +load(pathJoin("stack-intel", stack_intel_ver)) + +stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1" +load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) + +cmake_ver=os.getenv("cmake_ver") or "3.20.1" +load(pathJoin("cmake", cmake_ver)) + +load_any("netcdf/4.9.2","netcdf-c/4.9.2") +load_any("netcdf/4.9.2","netcdf-fortran/4.6.0") + +load("bacio/2.4.1") +load("sp/2.3.3") +load("w3emc/2.9.2") + +load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.9.0.1")) +load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3")) +load("ufs-pyenv") + +setenv("CMAKE_C_COMPILER","mpiicc") +setenv("CMAKE_CXX_COMPILER","mpiicpc") +setenv("CMAKE_Fortran_COMPILER","mpiifort") +setenv("CMAKE_Platform","hera.intel") + +prepend_path("MODULEPATH","/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles") +load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) + +if mode() == "load" then + LmodMsgRaw([===[Please do the following to activate conda: + > conda activate /scratch1/BMC/gmtb/SCM_anaconda/envs/pyccpp +]===]) +end + From 57e314855222d0dba696fdf164f2ac0600b3fc0c Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Wed, 8 Nov 2023 18:55:49 +0000 Subject: [PATCH 03/20] Add Hera GNU modulefile --- scm/etc/modules/hera_gnu.lua | 40 ++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 scm/etc/modules/hera_gnu.lua diff --git a/scm/etc/modules/hera_gnu.lua b/scm/etc/modules/hera_gnu.lua new file mode 100644 index 000000000..0e2be6128 --- /dev/null +++ b/scm/etc/modules/hera_gnu.lua @@ -0,0 +1,40 @@ +help([[ +This module loads libraries for building the CCPP Single-Column Model on +the NOAA RDHPC machine Hera using GNU 9.2.0 +]]) + +whatis([===[Loads libraries needed for building the UFS SRW App on Hera using GNU 9.2.0 ]===]) + +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles") + +load("stack-gcc/9.2.0") +load("stack-openmpi/4.1.5") +load("stack-python/3.9.12") +load("cmake/3.23.1") + +load("netcdf/4.7.2") + +load("bacio/2.4.1") +load("sp/2.3.3") +load("w3emc/2.9.2") + +load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.9.0.1")) +load(pathJoin("nco", os.getenv("nco_ver") or "5.0.6")) +load(pathJoin("openblas", os.getenv("openblas_ver") or "0.3.19")) +load("ufs-pyenv") + +setenv("CMAKE_C_COMPILER","mpicc") +setenv("CMAKE_CXX_COMPILER","mpicxx") +setenv("CMAKE_Fortran_COMPILER","mpif90") +setenv("CMAKE_Platform","hera.gnu") + +prepend_path("MODULEPATH","/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles") +load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) + +if mode() == "load" then + LmodMsgRaw([===[Please do the following to activate conda: + > conda activate /scratch1/BMC/gmtb/SCM_anaconda/envs/pyccpp +]===]) +end + From f06f90d601a35cb5a5a5406647d3b1cbf0373090 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Tue, 14 Nov 2023 15:57:54 -0700 Subject: [PATCH 04/20] Update Derecho module to use spack-stack --- scm/etc/modules/derecho_intel.lua | 33 +++++++++---------------------- 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/scm/etc/modules/derecho_intel.lua b/scm/etc/modules/derecho_intel.lua index d577090f4..0b6b28117 100644 --- a/scm/etc/modules/derecho_intel.lua +++ b/scm/etc/modules/derecho_intel.lua @@ -9,24 +9,18 @@ load(pathJoin("cmake", os.getenv("cmake_ver") or "3.26.3")) load(pathJoin("ncarenv", os.getenv("ncarenv_ver") or "23.06")) load(pathJoin("craype", os.getenv("craype_ver") or "2.7.20")) -unload("netcdf") -unload("hdf5") -load(pathJoin("intel-classic", os.getenv("intel_classic_ver") or "2023.0.0")) -load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver") or "8.1.25")) - -prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/derecho/hpc-stack/intel-classic-2023.0.0/modulefiles/stack") -load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0")) -load(pathJoin("hpc-intel-classic", os.getenv("hpc_intel_classic_ver") or "2023.0.0")) -load(pathJoin("hpc-cray-mpich", os.getenv("hpc_cray_mpich_ver") or "8.1.25")) - -load(pathJoin("ncarcompilers", os.getenv("ncarcompilers_ver") or "1.0.0")) - -load_any("netcdf/4.9.2","netcdf-c/4.9.2") -load_any("netcdf/4.9.2","netcdf-fortran/4.6.0") +unload("conda") +prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/spack-stack/derecho/modulefiles") +prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core") +load("stack-intel/2021.10.0") +load("stack-cray-mpich/8.1.25") +load("stack-python/3.10.8") +load("py-f90nml") +load("py-netcdf4/1.5.8") load("bacio/2.4.1") load("sp/2.3.3") -load("w3emc/2.9.2") +load("w3emc") setenv("CC","cc") setenv("FC","ftn") @@ -36,12 +30,3 @@ setenv("CMAKE_C_COMPILER","cc") setenv("CMAKE_CXX_COMPILER","CC") setenv("CMAKE_Fortran_COMPILER","ftn") setenv("CMAKE_Platform","derecho.intel") - -load("conda/latest") - -if mode() == "load" then - LmodMsgRaw([===[Please do the following to activate conda environment: - > conda activate /glade/p/ral/jntp/GMTB/CCPP_SCM/conda/ccpp-scm -]===]) -end - From dad9ffecb230f4a69e36d0d3c04c4a46109ec55e Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Wed, 15 Nov 2023 20:01:12 +0000 Subject: [PATCH 05/20] Update hera intel module to use spack-stack 1.5.1 --- scm/etc/modules/hera_intel.lua | 41 ++++++++++------------------------ 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/scm/etc/modules/hera_intel.lua b/scm/etc/modules/hera_intel.lua index beb63bad8..f0a1b1b1a 100644 --- a/scm/etc/modules/hera_intel.lua +++ b/scm/etc/modules/hera_intel.lua @@ -1,46 +1,29 @@ help([[ This module loads libraries for building the CCPP Single-Column Model on -the NOAA RDHPC machine Hera using Intel-2022.1.2 +the NOAA RDHPC machine Hera using Intel-2021.5.0 ]]) whatis([===[Loads libraries needed for building the CCPP SCM on Hera ]===]) -prepend_path("MODULEPATH","/contrib/sutils/modulefiles") -load("sutils") +load("cmake/3.20.1") -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles") -stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" -load(pathJoin("stack-intel", stack_intel_ver)) +load("stack-intel/2021.5.0") +load("stack-intel-oneapi-mpi") +load("stack-python/3.10.8") +load("py-f90nml") +load("py-netcdf4/1.5.8") -stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1" -load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) - -cmake_ver=os.getenv("cmake_ver") or "3.20.1" -load(pathJoin("cmake", cmake_ver)) - -load_any("netcdf/4.9.2","netcdf-c/4.9.2") -load_any("netcdf/4.9.2","netcdf-fortran/4.6.0") +load("netcdf-c/4.9.2") +load("netcdf-fortran/4.6.0") load("bacio/2.4.1") load("sp/2.3.3") -load("w3emc/2.9.2") - -load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.9.0.1")) -load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3")) -load("ufs-pyenv") +load("w3emc") setenv("CMAKE_C_COMPILER","mpiicc") setenv("CMAKE_CXX_COMPILER","mpiicpc") setenv("CMAKE_Fortran_COMPILER","mpiifort") setenv("CMAKE_Platform","hera.intel") - -prepend_path("MODULEPATH","/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles") -load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) - -if mode() == "load" then - LmodMsgRaw([===[Please do the following to activate conda: - > conda activate /scratch1/BMC/gmtb/SCM_anaconda/envs/pyccpp -]===]) -end - From e1a4c7016efe31d77d1050e91ea53106a8ed6ac5 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Wed, 15 Nov 2023 21:36:47 +0000 Subject: [PATCH 06/20] - Correct "whatis" for hera_intel - Update hera_gnu for spack-stack 1.5.1 --- scm/etc/modules/hera_gnu.lua | 31 ++++++++++--------------------- scm/etc/modules/hera_intel.lua | 2 +- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/scm/etc/modules/hera_gnu.lua b/scm/etc/modules/hera_gnu.lua index 0e2be6128..79543bf12 100644 --- a/scm/etc/modules/hera_gnu.lua +++ b/scm/etc/modules/hera_gnu.lua @@ -3,38 +3,27 @@ This module loads libraries for building the CCPP Single-Column Model on the NOAA RDHPC machine Hera using GNU 9.2.0 ]]) -whatis([===[Loads libraries needed for building the UFS SRW App on Hera using GNU 9.2.0 ]===]) +whatis([===[Loads libraries needed for building the CCPP SCM on Hera with GNU compilers ]===]) + +load("cmake/3.20.1") -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core") prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core") load("stack-gcc/9.2.0") load("stack-openmpi/4.1.5") -load("stack-python/3.9.12") -load("cmake/3.23.1") +load("stack-python/3.10.8") +load("py-f90nml") +load("py-netcdf4/1.5.8") -load("netcdf/4.7.2") +load("netcdf-c/4.9.2") +load("netcdf-fortran/4.6.0") load("bacio/2.4.1") load("sp/2.3.3") -load("w3emc/2.9.2") - -load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.9.0.1")) -load(pathJoin("nco", os.getenv("nco_ver") or "5.0.6")) -load(pathJoin("openblas", os.getenv("openblas_ver") or "0.3.19")) -load("ufs-pyenv") +load("w3emc") setenv("CMAKE_C_COMPILER","mpicc") setenv("CMAKE_CXX_COMPILER","mpicxx") setenv("CMAKE_Fortran_COMPILER","mpif90") setenv("CMAKE_Platform","hera.gnu") - -prepend_path("MODULEPATH","/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles") -load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) - -if mode() == "load" then - LmodMsgRaw([===[Please do the following to activate conda: - > conda activate /scratch1/BMC/gmtb/SCM_anaconda/envs/pyccpp -]===]) -end - diff --git a/scm/etc/modules/hera_intel.lua b/scm/etc/modules/hera_intel.lua index f0a1b1b1a..4c55a5340 100644 --- a/scm/etc/modules/hera_intel.lua +++ b/scm/etc/modules/hera_intel.lua @@ -3,7 +3,7 @@ This module loads libraries for building the CCPP Single-Column Model on the NOAA RDHPC machine Hera using Intel-2021.5.0 ]]) -whatis([===[Loads libraries needed for building the CCPP SCM on Hera ]===]) +whatis([===[Loads libraries needed for building the CCPP SCM on Hera with Intel compilers ]===]) load("cmake/3.20.1") From ad4d1c78824213a75e6ca1962a090d7e3ee93013 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Thu, 16 Nov 2023 11:17:13 -0700 Subject: [PATCH 07/20] Add a Derecho GNU modulefile --- scm/etc/modules/derecho_gnu.lua | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 scm/etc/modules/derecho_gnu.lua diff --git a/scm/etc/modules/derecho_gnu.lua b/scm/etc/modules/derecho_gnu.lua new file mode 100644 index 000000000..3af021586 --- /dev/null +++ b/scm/etc/modules/derecho_gnu.lua @@ -0,0 +1,28 @@ +help([[ +This module loads libraries for building the CCPP Single-Column Model on +the CISL machine Derecho (Cray) using Intel-classic-2023.0.0 +]]) + +whatis([===[Loads libraries needed for building the CCPP SCM on Derecho ]===]) + +load(pathJoin("cmake", os.getenv("cmake_ver") or "3.26.3")) +load(pathJoin("ncarenv", os.getenv("ncarenv_ver") or "23.06")) +load(pathJoin("craype", os.getenv("craype_ver") or "2.7.20")) + +unload("conda") +prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/spack-stack/derecho/modulefiles") +prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core") +load("stack-gcc/12.2.0") +load("stack-cray-mpich/8.1.25") +load("stack-python/3.10.8") +load("py-f90nml") +load("py-netcdf4/1.5.8") + +load("bacio/2.4.1") +load("sp/2.3.3") +load("w3emc") + +setenv("CMAKE_C_COMPILER","mpicc") +setenv("CMAKE_CXX_COMPILER","mpicxx") +setenv("CMAKE_Fortran_COMPILER","mpif90") +setenv("CMAKE_Platform","derecho.gnu") From 93c6d0a24df53e4ea30b0a67d7407f840f18e150 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Thu, 16 Nov 2023 15:35:27 -0700 Subject: [PATCH 08/20] Add check for existance of prebuild script in CMakeLists.txt, so if user forgot to clone recursively they don't get silent failures --- scm/src/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scm/src/CMakeLists.txt b/scm/src/CMakeLists.txt index b7c15b010..b952680b6 100644 --- a/scm/src/CMakeLists.txt +++ b/scm/src/CMakeLists.txt @@ -30,6 +30,9 @@ endif() message (STATUS "Running ccpp_prebuild.py for CCPP") # Make the directories where the ccpp_prebuild.py script wants to write caps and make snippets file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ccpp/physics/physics) +if (NOT EXISTS "${CMAKE_SOURCE_DIR}/../../ccpp/framework/scripts/ccpp_prebuild.py") + message( FATAL_ERROR "ccpp_prebuild.py script does not exist, did you check out the code recursively?" ) +endif() if (${CMAKE_BUILD_TYPE} MATCHES "Debug") execute_process( COMMAND ccpp/framework/scripts/ccpp_prebuild.py --config=ccpp/config/ccpp_prebuild_config.py ${_ccpp_suites_arg} --builddir=${CMAKE_CURRENT_BINARY_DIR} --debug --verbose From 1aceb9aa5682d6ca6810e0d77079e1a09f83421a Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Thu, 16 Nov 2023 16:26:05 -0700 Subject: [PATCH 09/20] Add netcdf loads to derecho modules. Not sure why this was working for me without them earlier... --- scm/etc/modules/derecho_gnu.lua | 3 +++ scm/etc/modules/derecho_intel.lua | 2 ++ 2 files changed, 5 insertions(+) diff --git a/scm/etc/modules/derecho_gnu.lua b/scm/etc/modules/derecho_gnu.lua index 3af021586..a59c2dd26 100644 --- a/scm/etc/modules/derecho_gnu.lua +++ b/scm/etc/modules/derecho_gnu.lua @@ -12,12 +12,15 @@ load(pathJoin("craype", os.getenv("craype_ver") or "2.7.20")) unload("conda") prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/spack-stack/derecho/modulefiles") prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core") + load("stack-gcc/12.2.0") load("stack-cray-mpich/8.1.25") load("stack-python/3.10.8") load("py-f90nml") load("py-netcdf4/1.5.8") +load("netcdf-c/4.9.2") +load("netcdf-fortran/4.6.0") load("bacio/2.4.1") load("sp/2.3.3") load("w3emc") diff --git a/scm/etc/modules/derecho_intel.lua b/scm/etc/modules/derecho_intel.lua index 0b6b28117..3b8cb1054 100644 --- a/scm/etc/modules/derecho_intel.lua +++ b/scm/etc/modules/derecho_intel.lua @@ -18,6 +18,8 @@ load("stack-python/3.10.8") load("py-f90nml") load("py-netcdf4/1.5.8") +load("netcdf-c/4.9.2") +load("netcdf-fortran/4.6.0") load("bacio/2.4.1") load("sp/2.3.3") load("w3emc") From 34a89c2a2b28f369029310eaa851ba7c5345dd70 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Thu, 16 Nov 2023 16:27:26 -0700 Subject: [PATCH 10/20] Add default value for SCM_ROOT. Had to move call to setup_logging() because for some reason calling logging prior to setup was messing up all the subsequent logging. --- scm/src/run_scm.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scm/src/run_scm.py b/scm/src/run_scm.py index 0d04edd25..20cfbce6a 100755 --- a/scm/src/run_scm.py +++ b/scm/src/run_scm.py @@ -758,13 +758,16 @@ def main(): verbose, levels, npz_type, vert_coord_file, case_data_dir, n_itt_out, \ n_itt_diag, run_dir, bin_dir, timestep) = parse_arguments() + setup_logging(verbose) + global SCM_ROOT SCM_ROOT = os.getenv('SCM_ROOT') if SCM_ROOT is None: - message = 'The SCM_ROOT environment variable is not set. Please set the SCM_ROOT environment variable to the top-level path where the model was cloned.' - logging.critical(message) - raise Exception(message) - + # Note: os.path.dirname() is the platform-agnostic way to get a parent directory + SCM_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + message = f"The SCM_ROOT environment variable is not set. Using default value:\n{SCM_ROOT}" + logging.warning(message) + global SCM_BIN if bin_dir: SCM_BIN = bin_dir @@ -782,14 +785,11 @@ def main(): global EXECUTABLE EXECUTABLE = os.path.join(SCM_RUN, EXECUTABLE_NAME) - setup_logging(verbose) - # Debugger if use_gdb: gdb = find_gdb() else: gdb = None - if (file != None): logging.info('SCM-run: Using {} to loop through defined runs'.format(file)) try: From 9131d537b7ee83be69ce6b7289f0e4997863cf95 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Fri, 17 Nov 2023 10:52:28 -0700 Subject: [PATCH 11/20] Remove extra spaces --- scm/etc/modules/hera_gnu.lua | 1 - scm/etc/modules/hera_intel.lua | 1 - 2 files changed, 2 deletions(-) diff --git a/scm/etc/modules/hera_gnu.lua b/scm/etc/modules/hera_gnu.lua index 79543bf12..3c381cde9 100644 --- a/scm/etc/modules/hera_gnu.lua +++ b/scm/etc/modules/hera_gnu.lua @@ -16,7 +16,6 @@ load("stack-python/3.10.8") load("py-f90nml") load("py-netcdf4/1.5.8") - load("netcdf-c/4.9.2") load("netcdf-fortran/4.6.0") load("bacio/2.4.1") diff --git a/scm/etc/modules/hera_intel.lua b/scm/etc/modules/hera_intel.lua index 4c55a5340..9216251b3 100644 --- a/scm/etc/modules/hera_intel.lua +++ b/scm/etc/modules/hera_intel.lua @@ -16,7 +16,6 @@ load("stack-python/3.10.8") load("py-f90nml") load("py-netcdf4/1.5.8") - load("netcdf-c/4.9.2") load("netcdf-fortran/4.6.0") load("bacio/2.4.1") From 8241fd5fe44ac38117a09a7fd9f9f8edd7d6b15b Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Fri, 17 Nov 2023 14:53:45 -0700 Subject: [PATCH 12/20] Updating derecho files to more exactly follow spack-stack setup instructions --- scm/etc/modules/derecho_gnu.lua | 9 ++++----- scm/etc/modules/derecho_intel.lua | 14 +++++--------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/scm/etc/modules/derecho_gnu.lua b/scm/etc/modules/derecho_gnu.lua index a59c2dd26..be07155c4 100644 --- a/scm/etc/modules/derecho_gnu.lua +++ b/scm/etc/modules/derecho_gnu.lua @@ -3,13 +3,12 @@ This module loads libraries for building the CCPP Single-Column Model on the CISL machine Derecho (Cray) using Intel-classic-2023.0.0 ]]) -whatis([===[Loads libraries needed for building the CCPP SCM on Derecho ]===]) +whatis([===[Loads spack-stack libraries needed for building the CCPP SCM on Derecho with GNU compilers]===]) -load(pathJoin("cmake", os.getenv("cmake_ver") or "3.26.3")) -load(pathJoin("ncarenv", os.getenv("ncarenv_ver") or "23.06")) -load(pathJoin("craype", os.getenv("craype_ver") or "2.7.20")) +setenv("LMOD_TMOD_FIND_FIRST","yes") +load("ncarenv/23.09") +load("cmake/3.26.3") -unload("conda") prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/spack-stack/derecho/modulefiles") prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core") diff --git a/scm/etc/modules/derecho_intel.lua b/scm/etc/modules/derecho_intel.lua index 3b8cb1054..37f784bfe 100644 --- a/scm/etc/modules/derecho_intel.lua +++ b/scm/etc/modules/derecho_intel.lua @@ -3,15 +3,15 @@ This module loads libraries for building the CCPP Single-Column Model on the CISL machine Derecho (Cray) using Intel-classic-2023.0.0 ]]) -whatis([===[Loads libraries needed for building the CCPP SCM on Derecho ]===]) +whatis([===[Loads spack-stack libraries needed for building the CCPP SCM on Derecho with Intel compilers]===]) -load(pathJoin("cmake", os.getenv("cmake_ver") or "3.26.3")) -load(pathJoin("ncarenv", os.getenv("ncarenv_ver") or "23.06")) -load(pathJoin("craype", os.getenv("craype_ver") or "2.7.20")) +setenv("LMOD_TMOD_FIND_FIRST","yes") +load("ncarenv/23.09") +load("cmake/3.26.3") -unload("conda") prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/spack-stack/derecho/modulefiles") prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core") + load("stack-intel/2021.10.0") load("stack-cray-mpich/8.1.25") load("stack-python/3.10.8") @@ -24,10 +24,6 @@ load("bacio/2.4.1") load("sp/2.3.3") load("w3emc") -setenv("CC","cc") -setenv("FC","ftn") -setenv("CXX","CC") - setenv("CMAKE_C_COMPILER","cc") setenv("CMAKE_CXX_COMPILER","CC") setenv("CMAKE_Fortran_COMPILER","ftn") From 50b924bd27bcbe541eefd45c79fc71635124e941 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Mon, 20 Nov 2023 19:41:27 +0000 Subject: [PATCH 13/20] Updating hera files to more exactly follow spack-stack setup instructions --- scm/etc/modules/hera_gnu.lua | 4 +++- scm/etc/modules/hera_intel.lua | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scm/etc/modules/hera_gnu.lua b/scm/etc/modules/hera_gnu.lua index 3c381cde9..23867c4ac 100644 --- a/scm/etc/modules/hera_gnu.lua +++ b/scm/etc/modules/hera_gnu.lua @@ -5,9 +5,11 @@ the NOAA RDHPC machine Hera using GNU 9.2.0 whatis([===[Loads libraries needed for building the CCPP SCM on Hera with GNU compilers ]===]) +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles") + load("cmake/3.20.1") +load("miniconda/3.9.12") -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles") prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core") load("stack-gcc/9.2.0") diff --git a/scm/etc/modules/hera_intel.lua b/scm/etc/modules/hera_intel.lua index 9216251b3..d84db665c 100644 --- a/scm/etc/modules/hera_intel.lua +++ b/scm/etc/modules/hera_intel.lua @@ -5,13 +5,14 @@ the NOAA RDHPC machine Hera using Intel-2021.5.0 whatis([===[Loads libraries needed for building the CCPP SCM on Hera with Intel compilers ]===]) +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles") load("cmake/3.20.1") +load("miniconda/3.9.12") prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core") -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles") load("stack-intel/2021.5.0") -load("stack-intel-oneapi-mpi") +load("stack-intel-oneapi-mpi/2021.5.1") load("stack-python/3.10.8") load("py-f90nml") load("py-netcdf4/1.5.8") From 36eadb61fc1fbb4c51545fcdde8a910da44f137c Mon Sep 17 00:00:00 2001 From: "Michael J. Kavulich, Jr" Date: Mon, 20 Nov 2023 20:56:00 +0000 Subject: [PATCH 14/20] Add spack-stack modulefiles for Jet --- scm/etc/modules/jet_gnu.lua | 31 +++++++++++++++++++++++++++++++ scm/etc/modules/jet_intel.lua | 31 +++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 scm/etc/modules/jet_gnu.lua create mode 100644 scm/etc/modules/jet_intel.lua diff --git a/scm/etc/modules/jet_gnu.lua b/scm/etc/modules/jet_gnu.lua new file mode 100644 index 000000000..96d5a1c97 --- /dev/null +++ b/scm/etc/modules/jet_gnu.lua @@ -0,0 +1,31 @@ +help([[ +This module loads libraries for building the CCPP Single-Column Model on +the NOAA RDHPC machine Jet using GNU 9.2.0 +]]) + +whatis([===[Loads libraries needed for building the CCPP SCM on Jet with GNU compilers ]===]) + +prepend_path("MODULEPATH", "/lfs4/HFIP/hfv3gfs/spack-stack/modulefiles") + +load("cmake/3.26.4") +load("miniconda/3.9.12") + +prepend_path("MODULEPATH", "/lfs4/HFIP/hfv3gfs/role.epic/modulefiles") +prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core") + +load("stack-gcc/9.2.0") +load("stack-openmpi/3.1.4") +load("stack-python/3.10.8") +load("py-f90nml") +load("py-netcdf4/1.5.8") + +load("netcdf-c/4.9.2") +load("netcdf-fortran/4.6.0") +load("bacio/2.4.1") +load("sp/2.3.3") +load("w3emc") + +setenv("CMAKE_C_COMPILER","mpicc") +setenv("CMAKE_CXX_COMPILER","mpicxx") +setenv("CMAKE_Fortran_COMPILER","mpif90") +setenv("CMAKE_Platform","jet.gnu") diff --git a/scm/etc/modules/jet_intel.lua b/scm/etc/modules/jet_intel.lua new file mode 100644 index 000000000..8c232ed26 --- /dev/null +++ b/scm/etc/modules/jet_intel.lua @@ -0,0 +1,31 @@ +help([[ +This module loads libraries for building the CCPP Single-Column Model on +the NOAA RDHPC machine Jet using Intel-2021.5.0 +]]) + +whatis([===[Loads libraries needed for building the CCPP SCM on Jet with Intel compilers ]===]) + +prepend_path("MODULEPATH", "/lfs4/HFIP/hfv3gfs/spack-stack/modulefiles") + +load("cmake/3.26.4") +load("miniconda/3.9.12") + +prepend_path("MODULEPATH", "/lfs4/HFIP/hfv3gfs/role.epic/modulefiles") +prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core") + +load("stack-intel/2021.5.0") +load("stack-intel-oneapi-mpi/2021.5.1") +load("stack-python/3.10.8") +load("py-f90nml") +load("py-netcdf4/1.5.8") + +load("netcdf-c/4.9.2") +load("netcdf-fortran/4.6.0") +load("bacio/2.4.1") +load("sp/2.3.3") +load("w3emc") + +setenv("CMAKE_C_COMPILER","mpiicc") +setenv("CMAKE_CXX_COMPILER","mpiicpc") +setenv("CMAKE_Fortran_COMPILER","mpiifort") +setenv("CMAKE_Platform","jet.intel") From 178b1a9ad55998646ea7ed584556b597829fb08c Mon Sep 17 00:00:00 2001 From: "Michael J. Kavulich, Jr" Date: Tue, 21 Nov 2023 08:05:16 -0600 Subject: [PATCH 15/20] Add spack-stack modulefiles forOrion --- scm/etc/modules/orion_gnu.lua | 30 ++++++++++++++++++++++++++++++ scm/etc/modules/orion_intel.lua | 30 ++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 scm/etc/modules/orion_gnu.lua create mode 100644 scm/etc/modules/orion_intel.lua diff --git a/scm/etc/modules/orion_gnu.lua b/scm/etc/modules/orion_gnu.lua new file mode 100644 index 000000000..17eb12b09 --- /dev/null +++ b/scm/etc/modules/orion_gnu.lua @@ -0,0 +1,30 @@ +help([[ +This module loads libraries for building the CCPP Single-Column Model on +the NOAA RDHPC machine orion using GNU 10.2.0 +]]) + +whatis([===[Loads libraries needed for building the CCPP SCM on Orion with GNU compilers ]===]) + +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/modulefiles") + +load("cmake/3.22.1") +load("python/3.9.2") + +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core") + +load("stack-gcc/10.2.0") +load("stack-openmpi/4.0.4") +load("stack-python/3.10.8") +load("py-f90nml") +load("py-netcdf4/1.5.8") + +load("netcdf-c/4.9.2") +load("netcdf-fortran/4.6.0") +load("bacio/2.4.1") +load("sp/2.3.3") +load("w3emc") + +setenv("CMAKE_C_COMPILER","mpicc") +setenv("CMAKE_CXX_COMPILER","mpicxx") +setenv("CMAKE_Fortran_COMPILER","mpif90") +setenv("CMAKE_Platform","orion.gnu") diff --git a/scm/etc/modules/orion_intel.lua b/scm/etc/modules/orion_intel.lua new file mode 100644 index 000000000..005119c5d --- /dev/null +++ b/scm/etc/modules/orion_intel.lua @@ -0,0 +1,30 @@ +help([[ +This module loads libraries for building the CCPP Single-Column Model on +the NOAA RDHPC machine Orion using Intel-2021.5.0 +]]) + +whatis([===[Loads libraries needed for building the CCPP SCM on Orion with Intel compilers ]===]) + +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/modulefiles") + +load("cmake/3.22.1") +load("python/3.9.2") + +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core") + +load("stack-intel/2022.0.2") +load("stack-intel-oneapi-mpi/2021.5.1") +load("stack-python/3.10.8") +load("py-f90nml") +load("py-netcdf4/1.5.8") + +load("netcdf-c/4.9.2") +load("netcdf-fortran/4.6.0") +load("bacio/2.4.1") +load("sp/2.3.3") +load("w3emc") + +setenv("CMAKE_C_COMPILER","mpiicc") +setenv("CMAKE_CXX_COMPILER","mpiicpc") +setenv("CMAKE_Fortran_COMPILER","mpiifort") +setenv("CMAKE_Platform","orion.intel") From 6a7eb94f5f183b608d555de790c0a755abf6ac83 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Tue, 21 Nov 2023 13:06:36 -0700 Subject: [PATCH 16/20] Update documentation for new build process. Note that the PDF has not been re-generated: my laptop currently lacks the necessary software (hopefully will get it soon). --- scm/doc/TechGuide/chap_quick.tex | 18 +++++++----------- scm/doc/TechGuide/chap_repo.tex | 13 +------------ 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/scm/doc/TechGuide/chap_quick.tex b/scm/doc/TechGuide/chap_quick.tex index 451613b59..79c539463 100644 --- a/scm/doc/TechGuide/chap_quick.tex +++ b/scm/doc/TechGuide/chap_quick.tex @@ -99,19 +99,15 @@ \subsection{Compilers} release website (\url{https://dtcenter.org/community-code/common-community-physics-package-ccpp/download}). \subsection{Using Existing Libraries on Preconfigured Platforms}\label{section: use_preconfigured_platforms} -Platform-specific scripts are provided to load modules and set the user environment for preconfigured platforms. These scripts load compiler modules (Fortran 2008-compliant), the NetCDF module, Python environment, etc. and set compiler and environment variables. From the top-level code directory (\execout{ccpp-scm} by default), source the correct script for your platform and shell. For \textit{t/csh} shells, -\begin{lstlisting}[language=csh] -source scm/etc/Hera_setup_intel.csh -source scm/etc/Cheyenne_setup_gnu.csh -source scm/etc/Cheyenne_setup_intel.csh -\end{lstlisting} -For bourne/bash shells, -\begin{lstlisting}[language=bash] -. scm/etc/Hera_setup_intel.sh -. scm/etc/Cheyenne_setup_gnu.sh -. scm/etc/Cheyenne_setup_intel.sh +Because the SCM can be built using the so-called \href{https://ufs-weather-model.readthedocs.io/en/latest/Glossary.html#term-spack-stack}{"spack-stack" libraries} maintained for the UFS Weather Model effort, there are many platforms where the SCM can be built using those existing libraries. This can be done by loading provided modules in the \execout{scm/etc/modules} directory (must be done from the top-level "ccpp-scm" directory; otherwise the \execout{module use} command should point to the corresponding absolute path): + +\begin{lstlisting}[language=sh] +module purge +module use scm/etc/modules +module load [machine]_[compiler] \end{lstlisting} +View the contents of the \execout{scm/etc/modules} directory to see if your machine/compiler combination is supported. As of this writing, modulefiles are provided for Intel and GNU compilers on the NCAR machine Derecho, the NOAA machines Hera and Jet, and the NOAA/MSU machine Orion. Loading these modules will set up all the needed compilers, libraries, and other programs needed for building, as well as the python libraries needed for both building and running the SCM. \subsection{Installing Libraries on Non-preconfigured Platforms}\label{section: setup_supported_platforms} For users on supported platforms such as generic Linux or macOS systems that have not been preconfigured, the \execout{hpc-stack} project is suggested for installing prerequisite libraries. Visit \url{https://github.com/NOAA-EMC/hpc-stack} for instructions for installing prerequisite libraries via \execout{hpc-stack} in their docs directory. UFS users who already installed libraries via the \execout{hpc-stack} package only need to set the compiler (\execout{CC, CXX, FC}), NetCDF (\execout{NetCDF\_ROOT}), and \execout{bacio}, \execout{sp} and \execout{w3emc} (\execout{bacio\_ROOT}, \execout{sp\_ROOT}, \execout{w3emc\_ROOT}) environment variables to point to their installation paths in order to compile the SCM. diff --git a/scm/doc/TechGuide/chap_repo.tex b/scm/doc/TechGuide/chap_repo.tex index 4c61361b8..f28f0588e 100644 --- a/scm/doc/TechGuide/chap_repo.tex +++ b/scm/doc/TechGuide/chap_repo.tex @@ -26,32 +26,21 @@ \section{What is included in the repository?} .3 Dockerfile\DTcomment{contains Docker instructions for building the CCPP SCM image}. .2 README.md. .2 scm/. - .3 bin/\DTcomment{build directory (initially empty; populated by cmake)}. .3 data/\DTcomment{build directory (most data directories populated by contrib/get\_all\_static\_data.sh)}. - .4 comparison\_data/\DTcomment{initially empty; contains data with which to compare SCM output}. - .4 physics\_input\_data/\DTcomment{initially empty; contains data needed by the CCPP physics}. - .4 processed\_case\_input/\DTcomment{initially empty; contains initialization and forcing data for cases}. - .4 raw\_case\_input/\DTcomment{initially empty; contains case data to be processed by scripts}. .4 vert\_coord\_data/\DTcomment{contains data to calculate vertical coordinates (from GSM-based GFS only)}. .3 doc/\DTcomment{contains this User's/Technical Guide}. .4 TechGuide/\DTcomment{contains LaTeX for this User's Guide}. .3 etc/\DTcomment{contains case configuration, machine setup scripts, and plotting scripts}. .4 case\_config/\DTcomment{contains case configuration files}. .4 CENTOS\_docker\_setup.sh\DTcomment{contains machine setup for Docker container}. - .4 Cheyenne\_setup\_gnu.csh\DTcomment{setup script for Cheyenne HPC for csh, tcsh}. - .4 Cheyenne\_setup\_gnu.sh\DTcomment{setup script for Cheyenne HPC for sh, bash}. - .4 Cheyenne\_setup\_intel.csh\DTcomment{setup script for Cheyenne HPC for csh, tcsh}. - .4 Cheyenne\_setup\_intel.sh\DTcomment{setup script for Cheyenne HPC for sh, bash}. .4 Desktop\_setup\_gfortran.csh\DTcomment{setup script for Mac Desktop for csh, tcsh}. .4 Desktop\_setup\_gfortran.sh\DTcomment{setup script for Mac Desktop for sh, bash}. - .4 Hera\_setup\_intel.csh\DTcomment{setup script for Theia HPC for csh, tcsh}. - .4 Hera\_setup\_intel.sh\DTcomment{setup script for Theia HPC for sh, bash}. + .4 modules/\DTcomment{Directory containing modulefiles for building on HPC environments (see section \ref{section: use_preconfigured_platforms})}. .4 scm\_qsub\_example.py\DTcomment{example QSUB run script}. .4 scm\_slurm\_example.py\DTcomment{example SLURM run script}. .4 scripts/\DTcomment{Python scripts for setting up cases and plotting}. .5 plot\_configs/\DTcomment{plot configuration files}. .4 tracer\_config\DTcomment{tracer configuration files}. .3 LICENSE.txt. - .3 run/\DTcomment{initially empty; populated by run\_scm.py}. .3 src/\DTcomment{source code for SCM infrastructure, Python run script, CMakeLists.txt for the SCM, example multirun setup files, suite\_info.py}. }} From 61d5bdf8295e7aef3c78058ec0f871582cf6f93a Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Thu, 11 Jan 2024 17:30:49 +0000 Subject: [PATCH 17/20] update .gitmodules and ccpp/physics submodule pointer --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8cd79bdc8..dc0798c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,10 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - #url = https://github.com/NCAR/ccpp-physics - #branch = main - url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR69 + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index c326b7a9b..be2e7bbea 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c326b7a9b7166eac2800329360d4e1366751c0db +Subproject commit be2e7bbea91d8e7bf999957f9d48981147120562 From 35f8bc9837224b0edfaa99bfcfbb6c56bd4eac99 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 17 Jan 2024 18:07:44 +0000 Subject: [PATCH 18/20] udpate .gitmodules --- .gitmodules | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8c0c73f9b..dc0798c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,10 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - #url = https://github.com/NCAR/ccpp-physics - #branch = main - url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR92 + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules From 33d7b748be08b5605a2af97d591f9d92411a5f7c Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 24 Jan 2024 17:47:53 -0500 Subject: [PATCH 19/20] update ccpp/physics and .gitmodules after testing --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5edd6912e..dc0798c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,10 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - #url = https://github.com/NCAR/ccpp-physics - #branch = main - url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR98 + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index 8cf9374da..378517c81 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 8cf9374da99d7932752173b40c6932e1f52caaac +Subproject commit 378517c81dac9cbe4f0bee41284b46ae070b4323 From baff0ec5926c57fc22813aedc15242dcfea56c87 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 30 Jan 2024 15:15:04 -0500 Subject: [PATCH 20/20] update ccpp/physics and .gitmodules --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index cdb76751f..dc0798c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,10 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - #url = https://github.com/NCAR/ccpp-physics - #branch = main - url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR102 + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index 8a64c5965..fb0000c3f 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 8a64c5965ecb99d95558f71c2435d5bbbb77b88b +Subproject commit fb0000c3f255c6f271817f0f6d88e43a29e179a3