Merge branch 'chs-conda3+4' into 'main'

add chs conda 0.3 and 0.4 load scripts

See merge request !12

.gitlab-ci.yml

@@ -27,26 +27,59 @@ show-env-vars:
 ### TEST JOBS ###
 #################
 
-eve.chs-conda01:
+.common-test-job:
   stage: test
-  script: source eve.chs-conda01
+  script:
+    - source $CI_JOB_NAME
+    - echo FC  = $FC
+    - echo F77 = $F77
+    - echo CC  = $CC
+    - echo CXX = $CXX
+    - echo "NetCDF-C:" $(nc-config --version)
+    - echo "NetCDF-F:" $(nf-config --version)
+    - make --version
+    - cmake --version
+    - python --version
+    - pip list
+
+eve.chs-conda01:
+  extends: .common-test-job
 
 eve.chs-conda02:
-  stage: test
-  script: source eve.chs-conda02
+  extends: .common-test-job
+
+eve.chs-conda03:
+  extends: .common-test-job
+
+eve.chs-conda04:
+  extends: .common-test-job
 
 eve.gfortran102:
-  stage: test
-  script: source eve.gfortran102
+  extends: .common-test-job
+
+eve.gfortran102MPI:
+  extends: .common-test-job
 
 eve.gfortran122:
-  stage: test
-  script: source eve.gfortran122
+  extends: .common-test-job
+
+eve.gfortran122MPI:
+  extends: .common-test-job
 
 eve.intel2020b:
-  stage: test
-  script: source eve.intel2020b
+  extends: .common-test-job
 
-eve.intel2023b:
-  stage: test
-  script: source eve.intel2023b-llvm
+eve.intel2020bMPI:
+  extends: .common-test-job
+
+eve.intel2023b-classic:
+  extends: .common-test-job
+
+eve.intel2023bMPI-classic:
+  extends: .common-test-job
+
+eve.intel2023b-llvm:
+  extends: .common-test-job
+
+eve.intel2023bMPI-llvm:
+  extends: .common-test-job

README.md

@@ -13,10 +13,12 @@ All these scripts will load:
 - pFUnit - Fortran unit testing framework
 
 ### Usage
-- Conda environment with gfortran:
+- Conda environment with GNU Compilers, Python and all dependencies for Documentation, Unit-Testing and Coverage:
   ```bash
-  source eve.chs-conda01 # or
-  source eve.chs-conda02
+  source eve.chs-conda01 # Python 3.10, GNU  9.4
+  source eve.chs-conda02 # Python 3.11, GNU 12.3
+  source eve.chs-conda03 # Python 3.12, GNU 13.3
+  source eve.chs-conda04 # Python 3.13, GNU 14.2
   ```
 - GNU 10.2 compiler (`foss/2020b` Toolchain):
   ```bash

eve.chs-conda01

 module purge
 module use /global/apps/modulefiles
 module load chs-fortran-conda/0.1.0
-export FC=gfortran
-export F77=gfortran
-export CC=gcc
-export CXX=g++

eve.chs-conda02

 module purge
 module use /global/apps/modulefiles
 module load chs-fortran-conda/0.2.0
-export FC=gfortran
-export F77=gfortran
-export CC=gcc
-export CXX=g++

eve.chs-conda03

+module purge
+module use /global/apps/modulefiles
+module load chs-fortran-conda/0.3.0

eve.chs-conda04

+module purge
+module use /global/apps/modulefiles
+module load chs-fortran-conda/0.4.0