Merge branch 'data_yaml_updates' of github.com:uramirez8707/FMS into …

…data_yaml_updates

.github/workflows/github_autotools_gnu.yml

@@ -4,6 +4,11 @@ name: Build libFMS test with autotools
 
 on: [push, pull_request]
 
+# cancel running jobs if theres a newer push
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -22,7 +27,7 @@ jobs:
         SKIP_TESTS: "test_yaml_parser.5" # temporary till fixes are in
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Prepare GNU autoconf for build
       run: autoreconf -if
     - name: Configure the build

.github/workflows/github_autotools_intel.yml

@@ -1,4 +1,10 @@
 on: pull_request
+
+# cancel running jobs if theres a newer push
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   intel-autotools:
     runs-on: ubuntu-latest
@@ -47,7 +53,7 @@ jobs:
         ./configure --prefix=/libs
         make -j install && cd
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Configure
       run: autoreconf -if ./configure.ac && ./configure --with-yaml
     - name: Compile

.github/workflows/github_cmake_gnu.yml

@@ -2,6 +2,11 @@ name: Build libFMS with cmake
 
 on: [push, pull_request]
 
+# cancel running jobs if theres a newer push
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -16,7 +21,7 @@ jobs:
         CMAKE_FLAGS: "${{ matrix.omp-flags }} ${{ matrix.io-flag  }} ${{ matrix.libyaml-flag }} -D64BIT=on"
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Generate makefiles with CMake
       run: cmake $CMAKE_FLAGS .
     - name: Build the library

.github/workflows/github_coupler_gnu.yml

@@ -1,6 +1,11 @@
 name: Test coupler build
 on: [pull_request]
 
+# cancel running jobs if theres a newer push
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   coupler-build:
     runs-on: ubuntu-latest
@@ -17,11 +22,11 @@ jobs:
         LDFLAGS: '-L/opt/view/lib'
     steps:
     - name: Checkout FMS
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         path: FMS
     - name: Checkout FMScoupler
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: 'NOAA-GFDL/FMScoupler'
         path: FMScoupler

.github/workflows/github_doc_site.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup repo
         run: | # do autotool's job for substitutes since we don't need a full build environement
           mkdir gen_docs

.github/workflows/github_linter.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Run Lint
         uses: NOAA-GFDL/simple_lint@f5aa1fe976bd4c231db0536ba00cbfdc26708253
         with:

.github/workflows/version.yml

@@ -7,7 +7,7 @@ jobs:
   add-dev-to-version:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Append version with dev
       run: sed -i '/20[0-9][0-9]\.[0-9][0-9]/ s/]/-dev]/' configure.ac
     - name: Create pull request

CMakeLists.txt

@@ -349,7 +349,7 @@ foreach(kind ${kinds})
   if ( CMAKE_Fortran_COMPILER_VERSION MATCHES "1[0-9]\.[0-9]*\.[0-9]*" AND CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
     if(MPI_C_COMPILER MATCHES ".*mpich.*" )
       message(STATUS "Adding -fallow-argument-mismatch flag to compile with GCC >=10 and MPICH")
-      set_target_properties(${libTgt}_f PROPERTIES COMPILE_FLAGS "-fallow-argument-mismatch -w")
+      target_compile_options(${libTgt}_f PRIVATE "-fallow-argument-mismatch;-w")
     endif()
   endif()
 

Makefile.am

@@ -79,15 +79,15 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = FMS.pc
 
 ## Build libFMS module
-AM_CPPFLAGS = -I${top_srcdir}/include -I${top_srcdir}/mpp/include
+AM_CPPFLAGS = -I${top_srcdir}/include
 AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 noinst_LTLIBRARIES = libFMS_mod.la
 libFMS_mod_la_SOURCES = libFMS.F90
 
 fms.$(FC_MODEXT): .mods/*_mod.$(FC_MODEXT)
 
-nodist_include_HEADERS = libFMS_mod.la
+nodist_include_HEADERS = .mods/fms.$(FC_MODEXT)
 
 include $(top_srcdir)/mkmods.mk
 
@@ -130,3 +130,20 @@ else
 clean-local:
 	-rm -rf .mods
 endif
+
+install-data-hook:
+	@echo ''
+	@echo '+-------------------------------------------------------------+'
+	@echo '| Congratulations! You have successfully installed the FMS    |'
+	@echo '| Fortran library.                                            |'
+	@echo '|                                                             |'
+	@echo '| After the installed include and link paths have been        |'
+	@echo '| specified, code using FMS should be compiled using the      |'
+	@echo '| "-lFMS" flag.                                               |'
+	@echo '|                                                             |'
+	@echo '| FMS is developed and maintained at the GFDL publicly on     |'
+	@echo '| Github. To report an issue or view available documentation, |'
+	@echo '| please see our page: https://www.github.com/NOAA-GFDL/FMS   |'
+	@echo '+-------------------------------------------------------------+'
+	@echo ''
+