Add pending fixups

.github/workflows/self-hosted-ci.yml

@@ -19,20 +19,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        config-name:
+        - nvidia-gpu-openacc
+        - cce-cpu-icon-production
+        - cce-gpu-openmp
         include:
+        # The tests are not experimental by default:
+        - experimental: false
         - config-name: nvidia-gpu-openacc
           enable-gpu: openacc
           compiler-modules: "PrgEnv-nvidia nvidia craype-accel-nvidia60 cdt-cuda/21.09 !cray-libsci_acc"
           # Generic accelerator flag
           #   -acc is removed as it should be detected by the configure script
           fcflags: "-O3 -Mallocatable=03 -gopt"
-          experimental: false
         - config-name: cce-cpu-icon-production
           enable-gpu: no
           compiler-modules: "PrgEnv-cray"
           # Production flags for Icon model
           fcflags: "-hadd_paren -r am -Ktrap=divz,ovf,inv -hflex_mp=intolerant -hfp1 -hnoacc -O1,cache0"
-          experimental: false
         - config-name: cce-gpu-openmp
           enable-gpu: openmp
           compiler-modules: "PrgEnv-cray craype-accel-nvidia60 cdt-cuda/22.05 cudatoolkit/11.2.0_3.39-2.1__gf93aa1c"

.gitignore

@@ -6,81 +6,38 @@
 *.pyc
 *.pyo
 .dirstamp
-/Makefile
-/config.cache
-/config.log
-/config.status
-/examples/**/*.test
-/tests/**/*.test
+/**/examples/**/*.test
+/**/tests/**/*.test
+Makefile
 __pycache__
+config.cache
+config.log
+config.status
 
 # Build stage files:
+*.L
 *.a
+*.acc.s
 *.o
-/examples/all-sky/rrtmgp_allsky
-/examples/rfmip-clear-sky/rrtmgp_rfmip_lw
-/examples/rfmip-clear-sky/rrtmgp_rfmip_sw
-/mod/*
+/**/examples/all-sky/rrtmgp_allsky
+/**/examples/rfmip-clear-sky/rrtmgp_rfmip_lw
+/**/examples/rfmip-clear-sky/rrtmgp_rfmip_sw
+/**/mod/*
 
 # Test stage files:
-/.testcache/*
-/examples/**/*.test.log
-/examples/all-sky/rrtmgp-allsky.nc
-/examples/rfmip-clear-sky/*.nc
-/examples/rfmip-clear-sky/timing.*
-/tests/**/*.test.log
-/tests/clear_sky_regression
-/tests/rrtmgp-gas-sw-g112.nc
-/tests/test_atmospheres.nc
-/tests/test_zenith_angle_spherical_correction
-/tests/validation-figures.pdf
+/**/.testcache/*
+/**/examples/**/*.nc
+/**/examples/**/*.test.log
+/**/examples/rfmip-clear-sky/timing.*
+/**/tests/*.nc
+/**/tests/*.pdf
+/**/tests/*.test.log
+/**/tests/clear_sky_regression
+/**/tests/test_zenith_angle_spherical_correction
 
 # Dist stage files:
-/rte+rrtmgp-*.tar*
+/**/rte+rrtmgp-*.tar*
 
 # MacOS files:
 *.dSYM
 .DS_Store
-
-# Original .gitignore:
-
-# Module files
-*.mod
-
-# Libraries
-*.a
-
-# Object files
-*.o
-
-# Dependency files
-*.d
-
-# Fortran module files
-*.mod
-*.mod.proxy
-
-# Intel vectorization reports
-*.optrpt
-
-# Netcdf file during testing
-examples/*/*.nc
-examples/*/*/*.nc
-
-# Jupyter notebooks
-.ipynb_checkpoints
-
-# Intel code coverage
-*.dyn
-*.dpi
-*.spi
-*.spl
-*.HTML
-*.html
-*.gif
-
-# gh-pages directory
-public
-
-# Ruby stuff
-**/Gemfile.lock

Makefile.in

@@ -132,15 +132,13 @@ mostlyclean:
 
 # Delete files generated at the building stage:
 clean: mostlyclean
-	rm -rf examples/all-sky/all-sky.test.log \
-	       examples/all-sky/rrtmgp-allsky.nc \
+	rm -rf examples/all-sky/*.nc \
+	       examples/all-sky/*.test.log \
 	       examples/rfmip-clear-sky/*.nc \
-	       examples/rfmip-clear-sky/rfmip-clear-sky.test.log \
+	       examples/rfmip-clear-sky/*.test.log \
 	       examples/rfmip-clear-sky/timing.* \
-	       tests/clear_sky_regression.test.log \
-	       tests/rrtmgp-gas-sw-g112.nc \
-	       tests/test_atmospheres.nc \
-	       tests/test_zenith_angle_spherical_correction.test.log \
+	       tests/*.nc \
+	       tests/*.test.log \
 	       $(testcachedir)
 	find . -name '*.pyc' -delete -o -name '*.pyo' -delete -o -name '__pycache__' -delete
 
@@ -149,10 +147,9 @@ clean: mostlyclean
 distclean: clean
 	rm -f $(lib_dep_files) $(prog_dep_files)
 	rm -f $(dir_files)
-	rm -rf examples/all-sky/all-sky.test \
-	       examples/rfmip-clear-sky/rfmip-clear-sky.test \
-	       tests/clear_sky_regression.test \
-	       tests/test_zenith_angle_spherical_correction.test
+	rm -rf examples/all-sky/*.test \
+	       examples/rfmip-clear-sky/*.test \
+	       tests/*.test
 	@for dir in $(moddir); do \
           if test -d "$$dir"; then \
             echo "find '$$dir' -type d -empty -delete"; \

autogen.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+script_dir=`echo "$0" | sed 's@[^/]*$@@'`
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+cd "$script_dir"
+
+autoreconf -fvi || exit $?

configure

@@ -2440,7 +2440,7 @@ elif $FC --version 2>&1 | grep '^AMD clang version' >/dev/null 2>&1; then :
   acx_cv_fc_compiler_vendor=amd
 elif $FC -V 2>&1 | grep '^f18 compiler' >/dev/null 2>&1; then :
   acx_cv_fc_compiler_vendor=flang
-elif $FC --version 2>&1 | grep '^clang version' >/dev/null 2>&1; then :
+elif $FC --version 2>&1 | grep 'clang version' >/dev/null 2>&1; then :
   acx_cv_fc_compiler_vendor=flang
 else
   acx_cv_fc_compiler_vendor=unknown
@@ -2460,46 +2460,46 @@ else
   case $acx_cv_fc_compiler_vendor in #(
   intel) :
     acx_cv_fc_compiler_version=`$FC --version 2>/dev/null | sed -n 's/^ifort (IFORT) \([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/p'`
-         if test -z "$acx_cv_fc_compiler_version"; then :
+         if test -n "$acx_cv_fc_compiler_version"; then :
+  acx_cv_fc_compiler_version="classic:${acx_cv_fc_compiler_version}"
+else
   acx_cv_fc_compiler_version=`$FC --version 2>/dev/null | sed -n 's/^ifx (IFORT) \([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/p'`
             if test -n "$acx_cv_fc_compiler_version"; then :
   acx_cv_fc_compiler_version="oneapi:${acx_cv_fc_compiler_version}"
 fi
-else
-  acx_cv_fc_compiler_version="classic:${acx_cv_fc_compiler_version}"
 fi ;; #(
   nag) :
     acx_cv_fc_compiler_version=`$FC -V 2>&1 | sed -n 's/^NAG Fortran Compiler Release \([0-9][0-9]*\.[0-9][0-9]*\).*Build \([0-9][0-9]*\)/\1.\2/p'` ;; #(
   portland) :
     acx_cv_fc_compiler_version=`$FC -V 2>/dev/null | sed -n 's/\(pgfortran\|pgf90\) \([0-9][0-9]*\.[0-9][0-9]*\)-\([0-9][0-9]*\).*/\2.\3/p'`
-         if test -z "$acx_cv_fc_compiler_version"; then :
+         if test -n "$acx_cv_fc_compiler_version"; then :
+  acx_cv_fc_compiler_version="pg:${acx_cv_fc_compiler_version}"
+else
   acx_cv_fc_compiler_version=`$FC -V 2>/dev/null | sed -n 's/nvfortran \([0-9][0-9]*\.[0-9][0-9]*\)-\([0-9][0-9]*\).*/\1.\2/p'`
             if test -n "$acx_cv_fc_compiler_version"; then :
   acx_cv_fc_compiler_version="nv:${acx_cv_fc_compiler_version}"
 fi
-else
-  acx_cv_fc_compiler_version="pg:${acx_cv_fc_compiler_version}"
 fi ;; #(
   cray) :
-    acx_cv_fc_compiler_version=`$FC -V 2>&1 | sed -n 's/.*ersion \([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/p'` ;; #(
+    acx_cv_fc_compiler_version=`$FC -V 2>&1 | sed -n 's/.*[vV]ersion \([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/p'` ;; #(
   nec) :
     acx_cv_fc_compiler_version=`$FC --version 2>&1 | sed -n 's/^nfort (NFORT) \([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/p'` ;; #(
   gnu) :
-    acx_cv_fc_compiler_version=`$FC -dumpfullversion 2>/dev/null`
-         if test $? -ne 0 || test -z "$acx_cv_fc_compiler_version"; then :
-  acx_cv_fc_compiler_version=`$FC -dumpversion 2>/dev/null`
+    acx_cv_fc_compiler_version=`$FC -dumpfullversion 2>/dev/null | sed -n '/^[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$/p'`
+         if test -z "$acx_cv_fc_compiler_version"; then :
+  acx_cv_fc_compiler_version=`$FC -dumpversion 2>/dev/null | sed -n '/^[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$/p'`
 fi ;; #(
   amd) :
     acx_cv_fc_compiler_version=`$FC --version 2>/dev/null | sed -n 's/.*AOCC_\([0-9][0-9]*\)[._]\([0-9][0-9]*\)[._]\([0-9][0-9]*\).*/\1.\2.\3/p'` ;; #(
   flang) :
     acx_cv_fc_compiler_version=`$FC -V 2>&1 | sed -n 's/.*version \([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)/\1/p'`
-         if test -z "$acx_cv_fc_compiler_version"; then :
+         if test -n "$acx_cv_fc_compiler_version"; then :
+  acx_cv_fc_compiler_version="f18:${acx_cv_fc_compiler_version}"
+else
   acx_cv_fc_compiler_version=`$FC --version 2>/dev/null | sed -n 's/.*version \([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/p'`
             if test -n "$acx_cv_fc_compiler_version"; then :
   acx_cv_fc_compiler_version="classic:${acx_cv_fc_compiler_version}"
 fi
-else
-  acx_cv_fc_compiler_version="f18:${acx_cv_fc_compiler_version}"
 fi ;; #(
   *) :
     acx_cv_fc_compiler_version=unknown ;;
@@ -2645,7 +2645,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       cd ..
       rm -rf conftest.dir
 fi
-   if test x"$acx_cv_fc_module_naming_upper" = xunknown || test x"$acx_cv_fc_module_naming_ext" = xunknown; then :
+   if test "x$acx_cv_fc_module_naming_upper" = xunknown || test "x$acx_cv_fc_module_naming_ext" = xunknown; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5