Changeset 8285
- Timestamp:
- 05/15/11 14:06:42 (14 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 1 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/Makefile.am
r8279 r8285 375 375 ./toolkits/petsc/patches/MatMultPatch.cpp\ 376 376 ./toolkits/petsc/petscincludes.h\ 377 ./toolkits/tao/taoincludes.h\378 377 ./toolkits/mpi/mpiincludes.h\ 379 378 ./toolkits/mpi/patches/mpipatches.h\ … … 1016 1015 ./toolkits/petsc/patches/MatMultPatch.cpp\ 1017 1016 ./toolkits/petsc/petscincludes.h\ 1018 ./toolkits/tao/taoincludes.h\1019 1017 ./toolkits/mpi/mpiincludes.h\ 1020 1018 ./toolkits/mpi/patches/mpipatches.h\ -
issm/trunk/src/c/shared/Matlab/ModuleBoot.cpp
r8279 r8285 3 3 * at the beginning of a module 4 4 */ 5 6 #ifdef HAVE_CONFIG_H7 #include "config.h"8 #else9 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"10 #endif11 5 12 6 #include "../../toolkits/toolkits.h" … … 24 18 PetscInitializeNoArguments(); 25 19 26 /*Initialize Tao*/27 #ifdef _HAVE_TAO_28 TaoInitialize(0,0,0,0);29 #endif30 31 20 return 1; 32 21 } -
issm/trunk/src/c/solutions/controltao_core.cpp
r8281 r8285 2 2 * \brief: core of the control solution 3 3 */ 4 #ifdef HAVE_CONFIG_H 5 #include "config.h" 6 #else 7 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" 8 #endif 4 9 5 10 #include "../toolkits/toolkits.h" … … 12 17 #include "../solvers/solvers.h" 13 18 19 #ifdef _HAVE_TAO_ 20 #include "tao.h" 21 #endif 14 22 15 23 void controltao_core(FemModel* femmodel){ … … 48 56 49 57 printf("I am in TAO!!\n"); 58 TaoInitialize(0,0,0,0); 50 59 51 60 /*Recover parameters used throughout the solution:{{{1*/ -
issm/trunk/src/c/toolkits/toolkits.h
r8279 r8285 10 10 #include "./metis/metisincludes.h" 11 11 #include "./triangle/triangleincludes.h" 12 #include "./tao/taoincludes.h"13 12 14 13 #endif
Note:
See TracChangeset
for help on using the changeset viewer.