git subrepo clone (merge) --branch=v2.1 --force...

git subrepo clone (merge) --branch=v2.1 --force https://git.ufz.de/chs/HPC-Fortran-module-loads.git hpc-module-loads

subrepo:
  subdir:   "hpc-module-loads"
  merged:   "7767f2b"
upstream:
  origin:   "https://git.ufz.de/chs/HPC-Fortran-module-loads.git"
  branch:   "v2.1"
  commit:   "7767f2b"
git-subrepo:
  version:  "0.4.1"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "a04d8c2"

hpc-module-loads/.gitlab-ci.yml

+variables:
+  GIT_DEPTH: 0
+  GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_RUNNER_SHORT_TOKEN/$CI_PROJECT_PATH/$CI_COMMIT_REF_NAME/$CI_JOB_NAME/$CI_CONCURRENT_ID
+
+stages:
+  - info
+  - test
+
+#############
+### INFOS ###
+#############
+
+show-env-vars:
+  stage: info
+  variables:
+    SEP: "##################################################################"
+    S00: "commit date - "
+    S01: "project: ${CI_PROJECT_PATH}"
+    S02: "branch: ${CI_COMMIT_REF_NAME}"
+    S03: "commit: ${CI_COMMIT_SHA}"
+    S04: "commit msg: ${CI_COMMIT_MESSAGE}"
+    S05: "clone base path: "
+    S06: "runner token: ${CI_RUNNER_SHORT_TOKEN}"
+  script: echo -e "${SEP}\n${S00}$(date)\n${SEP}\n${S01}\n${S02}\n${S03}\n${S04}\n${SEP}\n${S05}${GIT_CLONE_PATH}\n${S06}\n${SEP}"
+
+#################
+### TEST JOBS ###
+#################
+
+eve.chs-conda01:
+  stage: test
+  script: source eve.chs-conda01
+
+eve.chs-conda02:
+  stage: test
+  script: source eve.chs-conda02
+
+eve.gfortran102:
+  stage: test
+  script: source eve.gfortran102
+
+eve.gfortran122:
+  stage: test
+  script: source eve.gfortran122
+
+eve.intel2020b:
+  stage: test
+  script: source eve.intel2020b
+
+eve.intel2023b:
+  stage: test
+  script: source eve.intel2023b-llvm

hpc-module-loads/.gitrepo

@@ -5,8 +5,8 @@
 ;
 [subrepo]
 	remote = https://git.ufz.de/chs/HPC-Fortran-module-loads.git
-	branch = v1.9
-	commit = 6de5d97faed8f68fe0c049044ab768b26e1c26ea
-	parent = 3a6cc0fa85470b1b1a73078b7e0debb6130d2fe2
+	branch = v2.1
+	commit = 7767f2ba073dc1978d98bcb9ce952ffd576ef8d7
+	parent = 328e802e23346fa9e811d6fb547a00ff15d42f86
 	method = merge
-	cmdver = 0.4.3
+	cmdver = 0.4.1

hpc-module-loads/LICENSE

 The MIT License (MIT)
 
-Copyright (c) 2020 - 2023 CHS Developers
+Copyright (c) 2020 - 2024 CHS Developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

hpc-module-loads/README.md

@@ -10,27 +10,13 @@ All these scripts will load:
 - netCDF-Fortran
 - CMake
 - the MPR Python Environment (_except chs-conda environment_)
-- pFUnit - Fortran unit testing framework (_not available for GNU 6.4_)
+- pFUnit - Fortran unit testing framework
 
 ### Usage
 - Conda environment with gfortran:
   ```bash
-  source eve.chs-conda01
-  ```
-- GNU 6.4 compiler (`foss/2018a` Toolchain):
-  ```bash
-  source eve.gfortran64 # or
-  source eve.gfortran64MPI
-  ```
-- GNU 7.3 compiler (`foss/2018b` Toolchain):
-  ```bash
-  source eve.gfortran73 # or
-  source eve.gfortran73MPI
-  ```
-- GNU 8.3 compiler (`foss/2019b` Toolchain):
-  ```bash
-  source eve.gfortran83 # or
-  source eve.gfortran83MPI
+  source eve.chs-conda01 # or
+  source eve.chs-conda02
   ```
 - GNU 10.2 compiler (`foss/2020b` Toolchain):
   ```bash
@@ -42,28 +28,20 @@ All these scripts will load:
   source eve.gfortran122 # or
   source eve.gfortran122MPI
   ```
-- Intel 18 compiler (`iomkl/2018b` Toolchain):
-  ```bash
-  source eve.intel18 # or
-  source eve.intel18MPI
-  ```
-- Intel 19 compiler (`iomkl/2020a` Toolchain):
-  ```bash
-  source eve.intel19 # or
-  source eve.intel19MPI
-  ```
 - Intel 19.1.3 compiler (`iomkl/2020b` Toolchain):
   ```bash
   source eve.intel2020b # or
   source eve.intel2020bMPI
   ```
-- NAG 6.2 compiler:
+- Intel classic 2021.10.0 compiler (`intel/2023b` Toolchain):
   ```bash
-  source eve.nagfor62
+  source eve.intel2023b-classic # or
+  source eve.intel2023bMPI-classic
   ```
-- PGI 19 compiler:
+- Intel oneAPI 2023.2.0 compiler (`intel/2023b` Toolchain):
   ```bash
-  source eve.pgi19
+  source eve.intel2023b-llvm # or
+  source eve.intel2023bMPI-llvm
   ```
 
 ## Toolchains at Juwels
@@ -123,4 +101,4 @@ source lumi.gfortran112
 
 MIT License (MIT)
 
-Copyright (c) 2020 - 2023 CHS Developers
+Copyright (c) 2020 - 2024 CHS Developers

hpc-module-loads/eve.gfortran64 → hpc-module-loads/eve.chs-conda02

 module purge
 module use /global/apps/modulefiles
-module load python_env_mpr
-module load foss/2018a
-module load netCDF-Fortran
-module load CMake
+module load chs-fortran-conda/0.2.0
 export FC=gfortran
 export F77=gfortran
 export CC=gcc

hpc-module-loads/eve.gfortran83

-module purge
-module use /global/apps/modulefiles
-module load python_env_mpr
-module load foss/2019b
-module load netCDF-Fortran
-module load CMake
-module load pFUnit/4.2.2_foss2019b
-export FC=gfortran
-export F77=gfortran
-export CC=gcc
-export CXX=g++

hpc-module-loads/eve.gfortran83MPI

-module purge
-module use /global/apps/modulefiles
-module load python_env_mpr
-module load foss/2019b
-module load netCDF-Fortran
-module load CMake
-module load pFUnit/4.2.2_foss2019b
-export FC=mpifort
-export F77=mpifort
-export CC=mpicc
-export CXX=mpic++

hpc-module-loads/eve.intel18MPI

-module purge
-module use /global/apps/modulefiles
-module load python_env_mpr
-module load iomkl/2018b
-module load netCDF-Fortran
-module load CMake
-module load pFUnit/4.2.2_ifort18.0.3
-export FC=mpifort
-export F77=mpifort
-export CC=mpicc
-export CXX=mpic++

hpc-module-loads/eve.intel19

-module purge
-module use /global/apps/modulefiles
-module load python_env_mpr
-module load iomkl/2020a
-module load netCDF-Fortran
-module load CMake
-module load pFUnit/4.2.2_ifort19.1.1.217
-export FC=ifort
-export F77=ifort
-export CC=icc
-export CXX=icpc

hpc-module-loads/eve.intel19MPI

-module purge
-module use /global/apps/modulefiles
-module load python_env_mpr
-module load iomkl/2020a
-module load netCDF-Fortran
-module load CMake
-module load pFUnit/4.2.2_ifort19.1.1.217
-export FC=mpifort
-export F77=mpifort
-export CC=mpicc
-export CXX=mpic++

hpc-module-loads/eve.intel18 → hpc-module-loads/eve.intel2023b-classic

 module purge
 module use /global/apps/modulefiles
 module load python_env_mpr
-module load iomkl/2018b
-module load netCDF-Fortran
+module load intel/2023b
+module load netCDF-Fortran/4.6.1
 module load CMake
-module load pFUnit/4.2.2_ifort18.0.3
+module load pFUnit/4.8.0
 export FC=ifort
 export F77=ifort
 export CC=icc

hpc-module-loads/eve.gfortran64MPI → hpc-module-loads/eve.intel2023b-llvm

 module purge
 module use /global/apps/modulefiles
 module load python_env_mpr
-module load foss/2018a
-module load netCDF-Fortran
+module load intel/2023b
+module load netCDF-Fortran/4.6.1
 module load CMake
-export FC=mpifort
-export F77=mpifort
-export CC=mpicc
-export CXX=mpic++
+module load pFUnit/4.8.0
+export FC=ifx
+export F77=ifx
+export CC=icx
+export CXX=icpx

hpc-module-loads/eve.gfortran73MPI → hpc-module-loads/eve.intel2023bMPI-classic

 module purge
 module use /global/apps/modulefiles
 module load python_env_mpr
-module load foss/2018b
-module load netCDF-Fortran
+module load intel/2023b
+module load netCDF-Fortran/4.6.1
 module load CMake
-module load pFUnit/4.2.1_foss2018b
-export FC=mpifort
-export F77=mpifort
-export CC=mpicc
-export CXX=mpic++
+module load pFUnit/4.8.0
+export FC=mpiifort
+export F77=mpiifort
+export CC=mpiicc
+export CXX=mpiicpc

hpc-module-loads/eve.gfortran73 → hpc-module-loads/eve.intel2023bMPI-llvm

 module purge
 module use /global/apps/modulefiles
 module load python_env_mpr
-module load foss/2018b
-module load netCDF-Fortran
+module load intel/2023b
+module load netCDF-Fortran/4.6.1
 module load CMake
-module load pFUnit/4.2.1_foss2018b
-export FC=gfortran
-export F77=gfortran
-export CC=gcc
-export CXX=g++
+module load pFUnit/4.8.0
+export FC=mpiifx
+export F77=mpiifx
+export CC=mpiicx
+export CXX=mpiicpx

hpc-module-loads/eve.nagfor62

-module purge
-module use /global/apps/modulefiles
-module load python_env_mpr
-module load NAGfor/6.2.14
-module load netcdf-fortran/4.4.5-NAG-6.2.14-GCC-7.3.0-2.30-1
-module load CMake
-module load pFUnit/4.1.3_nagfor-6.2
-export FC=nagfor
-export F77=nagfor
-export CC=gcc
-export CXX=g++

hpc-module-loads/eve.pgi19

-module purge
-module use /global/apps/modulefiles
-module load python_env_mpr
-module load PGI/19.10-GCC-8.3.0-2.32
-module load netcdf-fortran/4.5.2-PGI-19.10-GCC-8.3.0-2.32-1
-module load CMake
-export FC=pgfortran