Merge branch 'update-cbool-flag-dev' into cmake-mac-win-dev

earth-system-radiation · Dec 9, 2024 · d9578ed · d9578ed
2 parents d8afcd7 + e43d38e
commit d9578ed
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 14 deletions.
diff --git a/.github/workflows/check-api.yml b/.github/workflows/check-api.yml
@@ -19,7 +19,7 @@ jobs:
       FCFLAGS: "-ffree-line-length-none -m64 -std=f2008 -march=native -fbounds-check -fmodule-private -fimplicit-none -finit-real=nan -g"
       RRTMGP_ROOT: ${{ github.workspace }}
       RTE_KERNELS: extern
-      RTE_BOOL: C
+      RTE_CBOOL: ON
       RRTMGP_DATA_VERSION: v1.8.2
     steps:
     #
@@ -37,6 +37,6 @@ jobs:
             -DCMAKE_Fortran_COMPILER=$FC \
             -DCMAKE_Fortran_FLAGS="$FCFLAGS" \
             -DRRTMGP_DATA_VERSION=$RRTMGP_DATA_VERSION \
-            -DBOOL_TYPE=$RTE_BOOL \
+            -DUSE_C_BOOL=$RTE_CBOOL \
             -DKERNEL_MODE=$RTE_KERNELS
         cmake --build build --config Release -- -j8
diff --git a/.github/workflows/containerized-ci.yml b/.github/workflows/containerized-ci.yml
@@ -51,7 +51,6 @@ jobs:
       FCFLAGS: ${{ matrix.fcflags }}
       # CMake variables:
       NFHOME: /opt/netcdf-fortran
-      RTE_BOOL: C
       RTE_KERNELS: ${{ matrix.rte-kernels }}
       RRTMGP_DATA_VERSION: v1.8.2
       BUILD_TYPE: Debug
@@ -93,7 +92,6 @@ jobs:
               -DCMAKE_Fortran_FLAGS="${{ env.FCFLAGS }}" \
               -DRRTMGP_DATA_VERSION=${{ env.RRTMGP_DATA_VERSION }} \
               -DPRECISION=${{ matrix.fpmodel }} \
-              -DBOOL_TYPE=${{ env.RTE_BOOL }} \
               -DKERNEL_MODE=${{ env.RTE_KERNELS }} \
               -DENABLE_TESTS=ON \
               -DFAILURE_THRESHOLD=${{ env.FAILURE_THRESHOLD }}

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -45,7 +45,7 @@ jobs:
       FC: ${{ matrix.compiler }}
       FCFLAGS: "-ffree-line-length-none -m64 -std=f2008 -march=native -fbounds-check -fmodule-private -fimplicit-none -finit-real=nan"
       RTE_KERNELS: default
-      RTE_BOOL: C
+      RTE_CBOOL: ON
       RRTMGP_DATA_VERSION: v1.8.2
       FAILURE_THRESHOLD: 7.e-4
       # Debug          - works
@@ -134,7 +134,7 @@ jobs:
               -DCMAKE_RANLIB="$RANLIB_PATH" \
               -DRRTMGP_DATA_VERSION=${{ env.RRTMGP_DATA_VERSION }} \
               -DPRECISION=${{ matrix.fpmodel }} \
-              -DBOOL_TYPE=${{ env.RTE_BOOL }} \
+              -DUSE_C_BOOL=${{ env.RTE_CBOOL }} \
               -DKERNEL_MODE=${{ env.RTE_KERNELS }} \
               -DENABLE_TESTS=ON \
               -DFAILURE_THRESHOLD=${{ env.FAILURE_THRESHOLD }}

diff --git a/.gitlab/common.yml b/.gitlab/common.yml
@@ -19,7 +19,7 @@
     # Build libraries, examples and tests
     #
     # - $FC -v
-    - cmake -S . -B build -DCMAKE_Fortran_COMPILER=$FC -DCMAKE_Fortran_FLAGS="$FCFLAGS" -DRRTMGP_DATA_VERSION=$RRTMGP_DATA_TAG -DPRECISION=$FPMODEL -DBOOL_TYPE=$RTE_BOOL -DKERNEL_MODE=$RTE_KERNELS -DENABLE_TESTS=ON -DFAILURE_THRESHOLD=$FAILURE_THRESHOLD
+    - cmake -S . -B build -DCMAKE_Fortran_COMPILER=$FC -DCMAKE_Fortran_FLAGS="$FCFLAGS" -DRRTMGP_DATA_VERSION=$RRTMGP_DATA_TAG -DPRECISION=$FPMODEL -DUSE_C_BOOL=$RTE_CBOOL -DKERNEL_MODE=$RTE_KERNELS -DENABLE_TESTS=ON -DFAILURE_THRESHOLD=$FAILURE_THRESHOLD
     - cmake --build build --config Release -- -j8
     #
     # Run examples, tests and checks

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,11 +45,12 @@ set_property(CACHE PRECISION PROPERTY STRINGS "DP" "SP")
 add_definitions("-DRTE_USE_${PRECISION}")
 message(STATUS "Adding compiler definition -DRTE_USE_${PRECISION}")
 
-set(BOOL_TYPE "C" CACHE STRING "Select the bool type: C, Fortran")
-set_property(CACHE BOOL_TYPE PROPERTY STRINGS "C" "Fortran")
+option(USE_C_BOOL "Use C bool" OFF)
 
-add_definitions("-DRTE_USE_${BOOL_TYPE}BOOL")
-message(STATUS "Adding compiler definition -DRTE_USE_${BOOL_TYPE}BOOL")
+if(USE_C_BOOL)
+    add_definitions("-DRTE_USE_CBOOL")
+    message(STATUS "Adding compiler definition -DRTE_USE_CBOOL")
+endif()
 
 set(CMAKE_Fortran_FLAGS "" CACHE STRING "Select Fortran compile flags")
 

diff --git a/doc/jekyll_site/how-tos/build-and-test.md b/doc/jekyll_site/how-tos/build-and-test.md
@@ -17,7 +17,7 @@ cmake -S . -B build \
 	-DCMAKE_Fortran_FLAGS=$FCFLAGS \
 	-DRRTMGP_DATA_VERSION=$RRTMGP_DATA_VERSION \
 	-DPRECISION=$FP_MODEL \
-	-DBOOL_TYPE=$RTE_BOOL \
+	-DUSE_C_BOOL=$RTE_CBOOL \
 	-DKERNEL_MODE=$RTE_KERNELS \
 	-DENABLE_TESTS=ON \
 	-DFAILURE_THRESHOLD=$FAILURE_THRESHOLD

diff --git a/setup.sh b/setup.sh
@@ -6,7 +6,7 @@ export FC=gfortran
 export FCFLAGS="-ffree-line-length-none -m64 -std=f2008 -march=native -fbounds-check -fmodule-private -fimplicit-none -finit-real=nan"
 export RRTMGP_DATA_VERSION=v1.8.2
 export FP_MODEL=DP
-export RTE_BOOL=C
+export RTE_CBOOL=ON
 export RTE_KERNELS=default
 export FAILURE_THRESHOLD=7.e-4
 
@@ -15,7 +15,7 @@ cmake -S . -B build -G "Ninja" \
         -DCMAKE_Fortran_FLAGS="$FCFLAGS" \
         -DRRTMGP_DATA_VERSION=$RRTMGP_DATA_VERSION \
         -DPRECISION=$FP_MODEL \
-        -DBOOL_TYPE=$RTE_BOOL \
+        -DUSE_C_BOOL=$RTE_CBOOL \
         -DKERNEL_MODE=$RTE_KERNELS \
         -DENABLE_TESTS=ON \
         -DFAILURE_THRESHOLD=$FAILURE_THRESHOLD \