PRMS compile w gfortran clang on OSX

.github/workflows/ci.yaml

@@ -172,14 +172,15 @@ jobs:
           if [[ "$MF6_REMOTE" != "$req_remote" ]]; then echo "bad mf6 remote in .mf6_ci_ref_remote"; exit 1; fi
 
       - name: Setup gfortran
+        if: runner.os != 'macOS'
         uses: fortran-lang/setup-fortran@v1
         with:
           compiler: gcc
           version: 11
 
-      - name: Link gfortran dylibs on Mac
-        if: runner.os == 'macOS'
-        run: .github/scripts/symlink_gfortran_mac.sh
+      # - name: Link gfortran dylibs on Mac
+      #   if: runner.os == 'macOS'
+      #   run: .github/scripts/symlink_gfortran_mac.sh
 
       - name: Install Dependencies via Micromamba
         uses: mamba-org/[email protected]

autotest/ci_local.sh

@@ -464,30 +464,30 @@ if [ -z "${t}" ]; then
             --domain=ucb_2yr \
             --control_pattern=nhm.control \
             --durations=0 || exit 1
-    fi
 
-    if [ -z "${g}" ]; then
-        echo
+        if [ -z "${g}" ]; then
+            echo
+            echo ".........."
+            echo "ucb_2yr_nhm_transp_frost - generate and manage test data"
+            echo ".........."
+            echo
+            python generate_test_data.py \
+                -n=$pytest_n --domain=ucb_2yr --control_pattern=frost.control \
+                --remove_prms_csvs --remove_prms_output_dirs || exit 1
+        fi
+
         echo ".........."
-        echo "ucb_2yr_nhm_transp_frost - generate and manage test data"
+        echo "ucb_2yr_nhm_transp_frost - pywatershed tests"
         echo ".........."
         echo
-        python generate_test_data.py \
-            -n=$pytest_n --domain=ucb_2yr --control_pattern=frost.control \
-            --remove_prms_csvs --remove_prms_output_dirs || exit 1
+        pytest \
+            -vv \
+            -n=$pytest_n \
+            test_prms_atmosphere_transp_frost.py \
+            --domain=ucb_2yr \
+            --control_pattern=frost.control \
+            --durations=0 || exit 1
     fi
-
-    echo ".........."
-    echo "ucb_2yr_nhm_transp_frost - pywatershed tests"
-    echo ".........."
-    echo
-    pytest \
-        -vv \
-        -n=$pytest_n \
-        test_prms_atmosphere_transp_frost.py \
-        --domain=ucb_2yr \
-        --control_pattern=frost.control \
-        --durations=0 || exit 1
 fi
 
 if [ -z "${i}" ]; then

environment.yml

@@ -14,6 +14,7 @@ dependencies:
   - folium
   - geopandas
   - geoviews
+  - gfortran
   - git
   - holoviews<=1.20.0
   - hvplot

environment_w_jupyter.yml

@@ -14,6 +14,7 @@ dependencies:
   - folium
   - geopandas
   - geoviews
+  - gfortran
   - git
   - holoviews<=1.20.0
   - hvplot

prms_src/prms5.2.1/makelist_double_precision

@@ -102,7 +102,7 @@ ifeq ($(detected_OS), Windows)
 		CFLAGS = -Dfloat=double $(OPTLEVEL) -D$(ARC) -D_UF -Wall
 	endif
 else
-	ifeq ($(CC), gcc)
+	ifeq ($(CC), $(filter $(CC), gcc clang))
 		CFLAGS = -Dfloat=double $(OPTLEVEL) -D$(ARC) -D_UF -Wall
 	endif
 	ifeq ($(CC), $(filter $(CC), icc mpiicc))

prms_src/prms5.2.1/mmf/defs.h

@@ -16,7 +16,7 @@
 #define FALSE 0
 
 #define ftnint int
-#define ftnlen int
+#define ftnlen long
 
 #define M_LONG 1
 #define M_FLOAT 2
@@ -73,4 +73,3 @@
 //#define MAX_SAVE_MAP 5
 
 #endif /* MMS_DEF_H */
-

prms_src/prms5.2.1/mmf/protos.h

@@ -17,7 +17,7 @@
 
 /***  mmf.c  **************************************************/
 extern long setdims_ (void);
-extern long call_modules_ (char *, int);
+extern long call_modules_ (char *, ftnlen);
 
 /***  alloc_space.c  **************************************************/
 #undef EXTERN

test_data/generate/conftest.py

@@ -64,7 +64,9 @@ def exe():
         exe_name = "prms_win_gfort_dbl_prec.exe"
     elif platform == "darwin":
         if processor() == "arm":
-            exe_name = "prms_mac_m1_ifort_dbl_prec"
+            # exe_name = "prms_mac_m1_ifort_dbl_prec"
+            # Revert this to ifort in final PR
+            exe_name = "prms_mac_m1_gfortran_clang_dbl_prec"
         else:
             exe_name = "prms_mac_intel_gfort_dbl_prec"
     elif platform == "linux":