Changeset 23350

Timestamp:

09/28/18 10:17:19 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: integrating MeDiPack

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (2 diffs)
• src/c/Makefile.am (modified) (1 diff)
• src/c/cores/controlm1qn3_core.cpp (modified) (1 diff)
• src/c/toolkits/codipack/ampi_interface.cpp (modified) (1 diff)

issm/trunk-jpl/m4/issm_options.m4

@@ -989 +989 @@
         AM_CONDITIONAL([ADJOINTMPI], [test x$HAVE_ADJOINTMPI = xyes])
         dnl }}}
+        dnl medipack (CoDiPack, ADOLC dev){{{
+        AC_ARG_WITH([medipack-dir],
+          AS_HELP_STRING([--with-medipack-dir=DIR], [MeDiPack root directory.]),
+          [MEDIPACK_ROOT=$withval],[MEDIPACK_ROOT="no"])
+
+        dnl Check whether medipack is enabled
+        AC_MSG_CHECKING([for medipack])
+        if test "x$MEDIPACK_ROOT" = "xno" ; then
+                HAVE_MEDIPACK=no
+        else
+                HAVE_MEDIPACK=yes
+                if ! test -d "$MEDIPACK_ROOT"; then
+                        AC_MSG_ERROR([medipack directory provided ($MEDIPACK_ROOT) does not exist]);
+                fi
+        fi
+        AC_MSG_RESULT($HAVE_MEDIPACK)
+
+        dnl medipack headers and libraries
+        if test "x$HAVE_MEDIPACK" == "xyes"; then
+                if test "x$CODIPACK_ROOT" == "xno"; then
+                        AC_MSG_ERROR([cannot run MeDiPack without CoDiPack]);
+                fi
+                MEDIPACKINCL="-I$MEDIPACK_ROOT/include -I$MEDIPACK_ROOT/src"
+                dnl Also set _HAVE_AMPI_, because the interface is (almost) the
+                dnl same as for adjoinable mpi...
+                AC_DEFINE([_HAVE_AMPI_],[1],[with adjoint mpi in ISSM src])
+                AC_DEFINE([_HAVE_MEDIPACK_],[1],[with MeDiPack in ISSM src])
+                AC_SUBST([MEDIPACKINCL])
+        fi
+        AM_CONDITIONAL([MEDIPACK], [test x$HAVE_MEDIPACK = xyes])
+
+        dnl }}}
         dnl rose{{{
         AC_ARG_WITH([rose-dir],
@@ -2235 +2267 @@
                         AC_MSG_ERROR([cannot compile ISSM with both PETSc and adolc]);
                 fi
+                if test "$HAVE_ADOLC" = "yes"  && test "$HAVE_CODIPACK" = "yes" ; then
+                        AC_MSG_ERROR([cannot compile ISSM with both ADOLC and CoDiPack]);
+                fi
                 dnl check that if we run meteoio, we have snowpack also
                 if test "$HAVE_METEOIO" = "yes"  && test "$HAVE_SNOWPACK" = "no" ; then

issm/trunk-jpl/src/c/Makefile.am

@@ -324 +324 @@
                                         ./classes/Inputs/TetraInput.cpp
 #}}}
-# ADJOINTMPI sources {{{
+#ADJOINTMPI/MeDiPack sources {{{
 if ADJOINTMPI
+issm_sources += ./toolkits/codipack/ampi_interface.cpp
+endif
+if MEDIPACK
 issm_sources += ./toolkits/codipack/ampi_interface.cpp
 endif

issm/trunk-jpl/src/c/cores/controlm1qn3_core.cpp

@@ -124 +124 @@
                                 &reverse,&indic,izs,rzs,(void*)&mystruct);
 
+        /*Print exit flag*/
         switch(int(omode)){
                 case 0:  _printf0_("   Stop requested (indic = 0)\n"); break;

issm/trunk-jpl/src/c/toolkits/codipack/ampi_interface.cpp

@@ +1 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
+
+#if defined(_HAVE_ADJOINTMPI_)
 #include "externals/ampi_interface_realreverse.cpp"
+#elif defined(_HAVE_MEDIPACK_)
+#include "medi/medi.cpp"
+#else
+#error "Cannot compile without MeDiPack and AdjointMpi"
+#endif
+