Feature/mtg2

CMakeLists.txt

@@ -98,17 +98,17 @@ ecbuild_add_option( FEATURE HEALPIX_EXAMPLES
 
 
 ###  Definitions used by the output manager
-ecbuild_add_option( FEATURE OUTPUT_MANAGER
+ecbuild_add_option( FEATURE MULTIO_OUTPUT_MANAGER
 	            DEFAULT ON
                     DESCRIPTION "Build the output manager" )
 
 ecbuild_add_option( FEATURE OUTPUT_MANAGER_ENCODER_REPORT
-                    CONDITION HAVE_OUTPUT_MANAGER
-		    DEFAULT OFF
+                    CONDITION HAVE_MULTIO_OUTPUT_MANAGER
+		                DEFAULT OFF
                     DESCRIPTION "Enable generation of the encoding report" )
 
 ecbuild_add_option( FEATURE OUTPUT_MANAGER_TOOL
-                    CONDITION HAVE_OUTPUT_MANAGER
+                    CONDITION HAVE_MULTIO_OUTPUT_MANAGER
                     DEFAULT OFF
                     DESCRIPTION "Enable generation of standalone tool" )
 
@@ -122,6 +122,7 @@ ecbuild_add_option( FEATURE MULTIO_CLIENT_MEMORY_PROFILE
 
 ### export package info
 set( MULTIO_CONFIG_DIR     share/multio/config )
+set( MULTIOM_CONFIG_DIR    share/multiom )
 set( MULTIO_INCLUDE_DIRS   ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src )
 set( MULTIO_LIBRARIES      multio )
 

cmake/fortran_compile_flags.cmake

@@ -20,10 +20,9 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "Cray")
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
   set(autopromote_flags   "-fdefault-real-8 -fdefault-double-8")
   #set(checkbounds_flags   "")
-  set(checkbounds_flags   "-fcheck=bounds")
+  # set(checkbounds_flags   "-fcheck=bounds")
   set(fpe_flags           "-ffpe-trap=invalid,zero,overflow")
   set(initsnan_flags      "-finit-real=snan")
-
   set(convert_flags       "-fconvert=big-endian")
   set(linelength_flags    "-ffree-line-length-none")
   set(nofma_flags         "")
@@ -34,7 +33,6 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
   set(checkbounds_flags   "")
   set(initsnan_flags      "-init=snan")
   set(fpe_flags           "-fpe0")
-
   #set(convert_flags       "-convert big-endian")
   set(convert_flags       "")
   set(linelength_flags    "")
@@ -43,19 +41,18 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "PGI|NVHPC")
   set(autopromote_flags   "-r8")
   set(fpe_flags           "-Ktrap=fp")
-  set(checkbounds_flags   "-Mbounds")
-
+  # set(checkbounds_flags   "-Mbounds")
   set(convert_flags       "-byteswapio")
   set(linelength_flags    "-Mfree -Mextend")
   set(nofma_flags         "")
 
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Flang")
   set(autopromote_flags   "-fdefault-real-8")
   set(fpe_flags           "-ffp-exception-behavior=strict")
-
   set(convert_flags       "-fconvert=big-endian")
   set(linelength_flags    "-ffree-line-length-none")
   set(nofma_flags         "-fno-fma")
+
 endif()
 
 if( NOT HAVE_SINGLE_PRECISION )
@@ -76,12 +73,13 @@ if( CMAKE_BUILD_TYPE MATCHES "Debug" AND NOT CMAKE_Fortran_COMPILER_ID MATCHES P
   endif()
 endif()
 
-if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
-  # if( NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 10 )
-  #   ecbuild_add_fortran_flags( "-fallow-argument-mismatch" NAME argument_mismatch )
-  # endif()
-  # ecbuild_add_fortran_flags( "-Wall -Wpedantic" NAME warnings )
-endif()
+# if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
+#   # if( NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 10 )
+#   #   ecbuild_add_fortran_flags( "-fallow-argument-mismatch" NAME argument_mismatch )
+#   # endif()
+#   # ecbuild_add_fortran_flags( "-Wall -Wpedantic" NAME warnings )
+#   ecbuild_add_fortran_flags( "-fno-ipa-modref -fno-ipa-pure-const -fno-ipa-cp -fno-ipa-sra -fno-tree-ccp -fno-tree-dominator-opts -fno-if-conversion -fno-if-conversion2 -ftime-report" NAME warnings )
+# endif()
 
 if(CMAKE_Fortran_COMPILER_ID MATCHES "Flang")
   # Linker complains of unknown arguments:

src/CMakeLists.txt

@@ -1,2 +1,8 @@
 add_subdirectory( multio )
-add_subdirectory( ecom )
+
+if (NOT CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
+message(STATUS "Building multiom")
+add_subdirectory( multiom )
+else ()
+message(WARNING "Skipping multiom because the GNU Fortran compiler is too slow.")
+endif()