Merge branch 'develop' into feature/ygyu/NPW_1_file

GEOS-ESM · Jan 7, 2025 · 8569d56 · 8569d56
2 parents 46d77c4 + b3cc556
commit 8569d56
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/actions/deploy-ford-docs/action.yml b/.github/actions/deploy-ford-docs/action.yml
@@ -49,14 +49,14 @@ runs:
         repository: Goddard-Fortran-Ecosystem/gFTL
         path: gFTL
         fetch-depth: 1
-        ref: v1.13.0
+        ref: v1.14.0
 
     - name: Build gFTL
       run: |
         cd gFTL
         mkdir -p build
         cd build
-        cmake .. -DCMAKE_Fortran_COMPILER=gfortran-10 -DCMAKE_INSTALL_PREFIX=../install
+        cmake .. -DCMAKE_Fortran_COMPILER=gfortran -DCMAKE_INSTALL_PREFIX=../install
         make -j$(nproc) install
       shell: bash
 

diff --git a/docs/Ford/docs-with-remote-esmf.md b/docs/Ford/docs-with-remote-esmf.md
@@ -7,8 +7,8 @@ coloured_edges: true
 graph_maxdepth: 4
 graph_maxnodes: 32
 include: ../../include/
-         ../../gFTL/install/GFTL-1.13/include/v1
-         ../../gFTL/install/GFTL-1.13/include/v2
+         ../../gFTL/install/GFTL-1.14/include/v1
+         ../../gFTL/install/GFTL-1.14/include/v2
 exclude: **/EsmfRegridder.F90
          **/FieldBLAS_IntrinsicFunctions.F90
          **/GeomManager.F90

diff --git a/docs/Ford/docs-with-remote-esmf.public_private_protected.md b/docs/Ford/docs-with-remote-esmf.public_private_protected.md
@@ -8,8 +8,8 @@ coloured_edges: true
 graph_maxdepth: 4
 graph_maxnodes: 32
 include: ../../include/
-         ../../gFTL/install/GFTL-1.13/include/v1
-         ../../gFTL/install/GFTL-1.13/include/v2
+         ../../gFTL/install/GFTL-1.14/include/v1
+         ../../gFTL/install/GFTL-1.14/include/v2
 exclude: **/EsmfRegridder.F90
          **/FieldBLAS_IntrinsicFunctions.F90
          **/GeomManager.F90

diff --git a/docs/Ford/ford-ci.md b/docs/Ford/ford-ci.md
@@ -8,8 +8,8 @@ coloured_edges: true
 graph_maxdepth: 4
 graph_maxnodes: 32
 include: ../../include/
-         ../../gFTL/install/GFTL-1.13/include/v1
-         ../../gFTL/install/GFTL-1.13/include/v2
+         ../../gFTL/install/GFTL-1.14/include/v1
+         ../../gFTL/install/GFTL-1.14/include/v2
 exclude: **/EsmfRegridder.F90
          **/FieldBLAS_IntrinsicFunctions.F90
          **/GeomManager.F90