Merge pull request #1 from climbfuji/no_arg_mismatch

Update branch no_arg_mismatch
NCAR · Feb 26, 2024 · 44eb919 · 44eb919
2 parents c87dbb7 + 13ec121
commit 44eb919
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.10)
 
 project(ccpp_framework
         VERSION 5.0.0
@@ -11,10 +11,11 @@ set(AUTHORS "Dom Heinzeller" "Grant Firl" "Mike Kavulich" "Steve Goldhaber")
 string(TIMESTAMP YEAR "%Y")
 
 #------------------------------------------------------------------------------
-# Set MPI flags for C/C++/Fortran
-if (MPI)
-  find_package(MPI REQUIRED C Fortran)
-endif (MPI)
+# Set MPI flags for C/C++/Fortran with MPI F08 interface
+find_package(MPI REQUIRED C Fortran)
+if(NOT MPI_Fortran_HAVE_F08_MODULE)
+  message(FATAL_ERROR "MPI implementation does not support the Fortran 2008 mpi_f08 interface")
+endif()
 
 #------------------------------------------------------------------------------
 # Set OpenMP flags for C/C++/Fortran

diff --git a/src/ccpp_types.F90 b/src/ccpp_types.F90
@@ -19,9 +19,7 @@
 !
 module ccpp_types
 
-#ifdef MPI
     use mpi_f08, only: MPI_Comm
-#endif
 
 !! \section arg_table_ccpp_types
 !! \htmlinclude ccpp_types.html
@@ -33,12 +31,6 @@ module ccpp_types
     public :: ccpp_t, one
     public :: MPI_Comm
 
-#ifndef MPI
-    type :: MPI_Comm
-      integer :: dummy = 0
-    end type MPI_Comm
-#endif
-
     !> @var Definition of constant one
     integer, parameter :: one = 1
 

diff --git a/test_prebuild/test_blocked_data/CMakeLists.txt b/test_prebuild/test_blocked_data/CMakeLists.txt
@@ -1,14 +1,21 @@
 #------------------------------------------------------------------------------
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.10)
 
 project(ccpp_blocked_data
         VERSION 1.0.0
-        LANGUAGES Fortran)
+        LANGUAGES C Fortran)
 
 #------------------------------------------------------------------------------
 # Request a static build
 option(BUILD_SHARED_LIBS "Build a shared library" OFF)
 
+#------------------------------------------------------------------------------
+# Set MPI flags for C/C++/Fortran with MPI F08 interface
+find_package(MPI REQUIRED C Fortran)
+if(NOT MPI_Fortran_HAVE_F08_MODULE)
+  message(FATAL_ERROR "MPI implementation does not support the Fortran 2008 mpi_f08 interface")
+endif()
+
 #------------------------------------------------------------------------------
 # Set the sources: physics type definitions
 set(TYPEDEFS $ENV{CCPP_TYPEDEFS})
@@ -57,6 +64,7 @@ set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O0 -fno-unsafe-math-optimizatio
 
 #------------------------------------------------------------------------------
 add_library(ccpp_blocked_data STATIC ${SCHEMES} ${CAPS} ${API})
+target_link_libraries(ccpp_blocked_data PRIVATE MPI::MPI_Fortran)
 # Generate list of Fortran modules from defined sources
 foreach(source_f90 ${CAPS} ${API})
     get_filename_component(tmp_source_f90 ${source_f90} NAME)

diff --git a/test_prebuild/test_blocked_data/README.md b/test_prebuild/test_blocked_data/README.md
@@ -10,4 +10,7 @@ mkdir build
 cd build
 cmake .. 2>&1 | tee log.cmake
 make 2>&1 | tee log.make
+./test_blocked_data.x
+# On systems where linking against the MPI library requires a parallel launcher,
+# use 'mpirun -np 1 ./test_blocked_data.x' or 'srun -n 1 ./test_blocked_data.x' etc.
 ```
diff --git a/test_prebuild/test_chunked_data/CMakeLists.txt b/test_prebuild/test_chunked_data/CMakeLists.txt
@@ -1,14 +1,21 @@
 #------------------------------------------------------------------------------
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.10)
 
 project(ccpp_chunked_data
         VERSION 1.0.0
-        LANGUAGES Fortran)
+        LANGUAGES C Fortran)
 
 #------------------------------------------------------------------------------
 # Request a static build
 option(BUILD_SHARED_LIBS "Build a shared library" OFF)
 
+#------------------------------------------------------------------------------
+# Set MPI flags for C/C++/Fortran with MPI F08 interface
+find_package(MPI REQUIRED C Fortran)
+if(NOT MPI_Fortran_HAVE_F08_MODULE)
+  message(FATAL_ERROR "MPI implementation does not support the Fortran 2008 mpi_f08 interface")
+endif()
+
 #------------------------------------------------------------------------------
 # Set the sources: physics type definitions
 set(TYPEDEFS $ENV{CCPP_TYPEDEFS})
@@ -57,6 +64,7 @@ set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O0 -fno-unsafe-math-optimizatio
 
 #------------------------------------------------------------------------------
 add_library(ccpp_chunked_data STATIC ${SCHEMES} ${CAPS} ${API})
+target_link_libraries(ccpp_chunked_data PRIVATE MPI::MPI_Fortran)
 # Generate list of Fortran modules from defined sources
 foreach(source_f90 ${CAPS} ${API})
     get_filename_component(tmp_source_f90 ${source_f90} NAME)

diff --git a/test_prebuild/test_chunked_data/README.md b/test_prebuild/test_chunked_data/README.md
@@ -10,4 +10,7 @@ mkdir build
 cd build
 cmake .. 2>&1 | tee log.cmake
 make 2>&1 | tee log.make
+./test_chunked_data.x
+# On systems where linking against the MPI library requires a parallel launcher,
+# use 'mpirun -np 1 ./test_chunked_data.x' or 'srun -n 1 ./test_chunked_data.x' etc.
 ```