Changeset 23357


Ignore:
Timestamp:
09/28/18 21:29:12 (6 years ago)
Author:
Mathieu Morlighem
Message:

CHG: integrating MeDiPack but not working yet

Location:
issm/trunk-jpl/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r23350 r23357  
    1 AM_CPPFLAGS = @NEOPZINCL@ @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @AMPIINCL@ @ADJOINTMPIINCL@ @MPIINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @TRIANGLEINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @CODIPACKINCL@ @GSLINCL@ @BOOSTINCL@ @ANDROID_NDKINCL@ @METEOIOINCL@ @SNOWPACKINCL@ @PROJ4INCL@
     1AM_CPPFLAGS = @NEOPZINCL@ @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @AMPIINCL@ @ADJOINTMPIINCL@ @MEDIPACKINCL@ @MPIINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @TRIANGLEINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @CODIPACKINCL@ @GSLINCL@ @BOOSTINCL@ @ANDROID_NDKINCL@ @METEOIOINCL@ @SNOWPACKINCL@ @PROJ4INCL@
    22
    33AUTOMAKE_OPTIONS = subdir-objects

  • issm/trunk-jpl/src/c/shared/Numerics/types.h

    r23244 r23357  
    2525#include "adolc/adolc.h"
    2626typedef adouble IssmDouble; /*for active variables*/
    27 typedef double IssmPDouble; /*for passive variables*/
     27typedef double  IssmPDouble; /*for passive variables*/
    2828
    2929#elif defined(_HAVE_CODIPACK_) && !defined(_WRAPPERS_)
    … …  
    3131#include <codi.hpp>
    3232typedef codi::RealReverse IssmDouble;
    33 typedef double IssmPDouble;
     33typedef double            IssmPDouble;
    3434
    3535/*Non-AD typedefs*/
    3636#else
    37 typedef double IssmDouble;
     37typedef double     IssmDouble;
    3838typedef IssmDouble IssmPDouble;
    3939#endif

  • issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.cpp

    r23349 r23357  
    338338               source,
    339339               tag,
    340                          #ifndef _HAVE_ADJOINTMPI_
     340                         #if !defined(_HAVE_ADJOINTMPI_) && !defined(_HAVE_MEDIPACK_)
    341341               AMPI_FROM_SEND, // as long as there are no other variants
    342342                         #endif
    … …  
    480480               dest,
    481481               tag,
    482                          #ifndef _HAVE_ADJOINTMPI_
     482                         #if !defined(_HAVE_ADJOINTMPI_) && !defined(_HAVE_MEDIPACK_)
    483483               AMPI_TO_RECV, // as long as there are no other variants
    484484                         #endif

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

    r23352 r23357  
    1616#include "../../shared/Numerics/types.h"
    1717
    18 #ifdef _HAVE_MPI_
     18#if defined(_HAVE_MPI_)
    1919        /*Include header files: {{{*/
    20         #if defined(_HAVE_AMPI_)
     20        #if defined(_HAVE_AMPI_) && !defined(_WRAPPERS_)
    2121                #if defined(_HAVE_ADJOINTMPI_)
    2222                        #include <ampi_tape.hpp>
    … …  
    4848
    4949        // types
    50         #if defined(_HAVE_MEDIPACK_)
     50        #if defined(_HAVE_MEDIPACK_) && !defined(_WRAPPERS_)
    5151        typedef AMPI_Comm             ISSM_MPI_Comm;
    5252        typedef AMPI_Datatype         ISSM_MPI_Datatype;
    … …  
    6060        #endif
    6161
    62         #if defined(_HAVE_MEDIPACK_)
     62        #if defined(_HAVE_MEDIPACK_) && !defined(_WRAPPERS_)
    6363        #define ISSM_MPI_CHAR       AMPI_CHAR
    6464        #define ISSM_MPI_DOUBLE     AMPI_ADOUBLE // corresponds to IssmDouble
    … …  
    7979
    8080        #else
    81                 #if defined(_HAVE_AMPI_)
     81        #if defined(_HAVE_AMPI_) && !defined(_WRAPPERS_)
    8282                        #define ISSM_MPI_DOUBLE    AMPI_ADOUBLE // corresponds to IssmDouble
    8383                #else

  • issm/trunk-jpl/src/wrappers/matlab/Makefile.am

    r23246 r23357  
    1 AM_CPPFLAGS = @NEOPZINCL@ @DAKOTAINCL@ @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @AMPIINCL@ @ADJOINTMPIINCL@ @CODIPACKINCL@
     1AM_CPPFLAGS = @NEOPZINCL@ @DAKOTAINCL@ @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @AMPIINCL@ @ADJOINTMPIINCL@ @MEDIPACKINCL@ @CODIPACKINCL@
    22AUTOMAKE_OPTIONS = subdir-objects
    33

  • issm/trunk-jpl/src/wrappers/python/Makefile.am

    r23246 r23357  
    1 AM_CPPFLAGS = @DAKOTAINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@ @AMPIINCL@ @ADJOINTMPIINCL@ @CODIPACKINCL@
     1AM_CPPFLAGS = @DAKOTAINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@ @AMPIINCL@ @ADJOINTMPIINCL@ @MEDIPACKINCL@ @CODIPACKINCL@
    22AUTOMAKE_OPTIONS = subdir-objects
    33
Note: See TracChangeset for help on using the changeset viewer.