Merge pull request #140 from CasparJungbacker/dev-cmake

Refactor CMake

Clean up and refactor our CMake infrastructure, using ECMWF's [ecbuild](https://github.com/ecmwf/ecbuild) helper functions.

- Use CMake presets for toolchain selection. Instead of using the `SYST` environment variable, a toolchain can be selected by providing `--preset=<name>` to the `cmake` command. For example:
```
cmake --preset=gnu ..
```
is equal to the old workflow of setting `SYST=gnu-fast` before calling `cmake`. To get a list of all defined presets, execute:
```
cmake --list-presets
```

- Renamed some compilation options. I will provide an updated list of these in the documentation.
- Renamed the DALES executable from `dalesX.Y` to just `dales`. The DALES library has been renamed to `libdales`.
- Disabled compilation of the DALES library by default.
- Update minimum CMake version to 3.17.
- Updated CI.

Author: fjansson

.github/workflows/compile.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         toolchain: ["gnu", "intel"]
-        hypre:   ["", "-DUSE_HYPRE=T"]
+        hypre:   ["On", "Off"]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -54,8 +54,6 @@ jobs:
 
           sudo apt install -y intel-oneapi-mpi-devel intel-oneapi-compiler-fortran
 
-          echo "SYST=localpc_ifx" >> $GITHUB_ENV 
-
       - name: Checkout NetCdf-Fortran for Intel
         if: matrix.toolchain == 'intel'
         uses: actions/checkout@v2
@@ -87,7 +85,7 @@ jobs:
           fi
           mkdir build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=DEBUG ${{ matrix.fftw }} ${{ matrix.hypre }} ../
+          cmake --preset=${{ matrix.toolchain }} -DCMAKE_BUILD_TYPE=DEBUG -DENABLE_HYPRE=${{ matrix.hypre }} ../
 
       - name : Build
         run: |

.github/workflows/precision.yml

@@ -19,9 +19,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        hypre:    ["", "-DUSE_HYPRE=T"]
-        field_r: ["32","64"]
-        pois_r:  ["32","64"]
+        hypre:    ["On", "Off"]
+        sp_fields: ["On","Off"]
+        sp_pois:  ["On","Off"]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -39,11 +39,11 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=DEBUG \
-           ${{ matrix.fftw }} \
-           ${{ matrix.hypre }} \
-           -DPOIS_PRECISION=${{ matrix.pois_r }} \
-           -DFIELD_PRECISION=${{ matrix.field_r }} ../
+          cmake --preset=gnu \
+            -DENABLE_HYPRE=${{ matrix.hypre }} \
+            -DENABLE_FP32_FIELDS=${{ matrix.sp_fields }} \
+            -DENABLE_FP32_POIS=${{ matrix.sp_pois }} \
+            ../
       - name : Build
         run: |
           cd build

.github/workflows/test.yml

@@ -30,7 +30,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=DEBUG -DUSE_FFTW=True ..
+          cmake --preset=gnu -DCMAKE_BUILD_TYPE=Debug ../
 
       - name: Build
         run: |
@@ -49,6 +49,6 @@ jobs:
           
       - name: Run tests
         run: |
-          export DALES=$(find ~+/build/src -maxdepth 1 -name "dales*")
+          export DALES=/home/runner/work/dales/dales/build/bin/dales
           pytest -rf --assert=plain --case=${{ matrix.case }}
           

.gitmodules

@@ -7,3 +7,7 @@
 [submodule "src/RTE-RRTMGP"]
 	path = src/RTE-RRTMGP
 	url = https://github.com/earth-system-radiation/rte-rrtmgp.git
+[submodule "external/ecbuild"]
+	path = external/ecbuild
+	url = https://github.com/ecmwf/ecbuild.git
+	branch = develop