Changeset 13767
- Timestamp:
- 10/20/12 00:24:34 (12 years ago)
- Location:
- issm/trunk-jpl/src
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/classes/AdolcEdf.h
r13530 r13767 9 9 #define _ADOLC_EDF_H_ 10 10 11 #ifdef _HAVE_ADOLC_ 11 #ifdef HAVE_CONFIG_H 12 #include <config.h> 13 #else 14 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" 15 #endif 16 17 18 #if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_) 12 19 13 20 struct Adolc_edf { -
issm/trunk-jpl/src/c/classes/objects/Options/GenericOption.h
r13623 r13767 91 91 }; 92 92 93 #if def _HAVE_ADOLC_//We hook off this specific specialization when not running ADOLC, otherwise we get a redeclaration with the next specialization.93 #if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_) //We hook off this specific specialization when not running ADOLC, otherwise we get a redeclaration with the next specialization. 94 94 template <> inline void GenericOption<IssmPDouble*>::Get(IssmPDouble** pvalue){ /*{{{*/ 95 95 -
issm/trunk-jpl/src/c/include/types.h
r13613 r13767 26 26 #endif 27 27 28 #if def _HAVE_ADOLC_28 #if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_) 29 29 #include "adolc/adolc.h" 30 30 // for active variables -
issm/trunk-jpl/src/c/modules/Solverx/Solverx.h
r13623 r13767 27 27 void SolverxSeq(IssmPDouble *X, IssmPDouble *A, IssmPDouble *B,int n); 28 28 29 #if def _HAVE_ADOLC_29 #if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_) 30 30 void SolverxSeq(IssmDouble *X,IssmDouble *A,IssmDouble *B,int n, Parameters* parameters); 31 31 // call back functions: -
issm/trunk-jpl/src/c/shared/Numerics/isnan.h
r12583 r13767 5 5 #ifndef _XISNAN_H_ 6 6 #define _XISNAN_H_ 7 8 #ifdef HAVE_CONFIG_H 9 #include <config.h> 10 #else 11 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" 12 #endif 13 7 14 8 15 #include <cmath> … … 16 23 } 17 24 18 #if def _HAVE_ADOLC_25 #if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_) 19 26 template <> int xIsNan<adouble> (const adouble& X); 20 27 #endif -
issm/trunk-jpl/src/c/shared/Numerics/recast.h
r12546 r13767 9 9 #define _RECAST_H_ 10 10 11 #ifndef _HAVE_ADOLC_ 11 #ifdef HAVE_CONFIG_H 12 #include <config.h> 13 #else 14 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" 15 #endif 16 17 #if !defined(_HAVE_ADOLC_) || defined(_WRAPPERS_) 12 18 13 19 template<class To, class From> -
issm/trunk-jpl/src/wrappers/matlab/Makefile.am
r13753 r13767 24 24 ./io/MatlabMatrixToDoubleMatrix.cpp\ 25 25 ./io/MatlabMatrixToSeqMat.cpp\ 26 ./io/MatlabVectorToSeqVec.cpp\ 27 ./io/MatlabMatrixToPetscMat.cpp\ 26 ./io/MatlabVectorToSeqVec.cpp 27 28 if PETSC 29 io_sources= += ./io/MatlabMatrixToPetscMat.cpp\ 28 30 ./io/MatlabVectorToPetscVec.cpp 29 30 ALLCXXFLAGS= -fPIC -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_ $(CXXFLAGS) $(CXXOPTFLAGS) 31 endif 32 33 34 35 ALLCXXFLAGS= -fPIC -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_ -D_WRAPPERS_ $(CXXFLAGS) $(CXXOPTFLAGS) 31 36 libISSMMatlab_a_SOURCES = $(io_sources) 32 37 libISSMMatlab_a_CXXFLAGS= $(ALLCXXFLAGS) … … 89 94 90 95 #Triangle library 91 AM_CXXFLAGS = -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER 96 AM_CXXFLAGS = -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER -D_WRAPPERS_ 92 97 93 98 #Matlab part … … 105 110 endif 106 111 107 AM_CXXFLAGS += -D_HAVE_MATLAB_MODULES_ -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread112 AM_CXXFLAGS += -D_HAVE_MATLAB_MODULES_ -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread 108 113 109 114 if SHAREDLIBS -
issm/trunk-jpl/src/wrappers/matlab/io/MatlabMatrixToPetscMat.cpp
r13749 r13767 11 11 12 12 /*Petsc includes: */ 13 #ifdef _HAVE_PETSC_ 13 14 #include <petscmat.h> 14 15 #include <petscvec.h> 15 16 #include <petscksp.h> 17 #endif 16 18 17 19 /*Matlab includes: */ -
issm/trunk-jpl/src/wrappers/python/Makefile.am
r13749 r13767 17 17 ./io/FetchPythonData.cpp 18 18 19 ALLCXXFLAGS= -fPIC -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_ $(CXXFLAGS) $(CXXOPTFLAGS)19 ALLCXXFLAGS= -fPIC -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_ -D_WRAPPERS_ $(CXXFLAGS) $(CXXOPTFLAGS) 20 20 libISSMPython_a_SOURCES = $(io_sources) 21 21 libISSMPython_a_CXXFLAGS= $(ALLCXXFLAGS) … … 65 65 endif 66 66 67 AM_CXXFLAGS += -D_HAVE_PYTHON_MODULES_ -fPIC67 AM_CXXFLAGS += -D_HAVE_PYTHON_MODULES_ -fPIC 68 68 if PYTHON3 69 69 AM_CXXFLAGS += -DNPY_NO_DEPRECATED_API
Note:
See TracChangeset
for help on using the changeset viewer.