Changeset 23459

Timestamp:

11/07/18 09:00:57 (6 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing new MeDiPack implementation of CoDiPack

Location:

issm/trunk-jpl

Files:

• jenkins/linux64_ross_codi (modified) (2 diffs)
• src/c/toolkits/mpi/issmmpi.h (modified) (1 diff)

issm/trunk-jpl/jenkins/linux64_ross_codi

@@ -26 +26 @@
                                 --with-m1qn3-dir="$ISSM_DIR/externalpackages/m1qn3/install" \
                                 --with-codipack-dir="$ISSM_DIR/externalpackages/codipack/install" \
+                                --with-medipack-dir="$ISSM_DIR/externalpackages/medipack/install" \
                                 --enable-tape-alloc \
-                                --with-cxxoptflags="-DAD_TYPE=codi::RealReverse" \
-                                --with-adjointmpi-dir="$ISSM_DIR/externalpackages/adjointmpi/install" \
                                 --enable-development \
                                 --enable-debugging '
@@ -48 +47 @@
                   gsl         install-linux64.sh
                   m1qn3       install.sh
-                  adjointmpi  install.sh
+                  medipack    install.sh
                   codipack    install.sh
                   shell2junit install.sh"

issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.h

@@ -25 +25 @@
                         #include "medi/medi.hpp"
                         using namespace medi;
-                        #include "medi/codiMediPackTypes.hpp"
                         #if defined(_HAVE_CODIPACK_)
+                        #include "externals/codiMediPackTypes.hpp"
                         #define TOOL CoDiPackTool<IssmDouble>
                         #define AMPI_ADOUBLE TOOL::MPI_TYPE