Changeset 8285


Ignore:
Timestamp:
05/15/11 14:06:42 (14 years ago)
Author:
Mathieu Morlighem
Message:

Start Tao only in controltao

Location:
issm/trunk/src/c
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed

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

    r8279 r8285  
    375375                                        ./toolkits/petsc/patches/MatMultPatch.cpp\
    376376                                        ./toolkits/petsc/petscincludes.h\
    377                                         ./toolkits/tao/taoincludes.h\
    378377                                        ./toolkits/mpi/mpiincludes.h\
    379378                                        ./toolkits/mpi/patches/mpipatches.h\
    … …  
    10161015                                        ./toolkits/petsc/patches/MatMultPatch.cpp\
    10171016                                        ./toolkits/petsc/petscincludes.h\
    1018                                         ./toolkits/tao/taoincludes.h\
    10191017                                        ./toolkits/mpi/mpiincludes.h\
    10201018                                        ./toolkits/mpi/patches/mpipatches.h\

  • issm/trunk/src/c/shared/Matlab/ModuleBoot.cpp

    r8279 r8285  
    33 * at the beginning of a module
    44 */
    5 
    6 #ifdef HAVE_CONFIG_H
    7         #include "config.h"
    8 #else
    9 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
    10 #endif
    115
    126#include "../../toolkits/toolkits.h"
    … …  
    2418        PetscInitializeNoArguments();
    2519
    26         /*Initialize Tao*/
    27         #ifdef _HAVE_TAO_
    28         TaoInitialize(0,0,0,0);
    29         #endif
    30 
    3120        return 1;
    3221}

  • issm/trunk/src/c/solutions/controltao_core.cpp

    r8281 r8285  
    22 * \brief: core of the control solution
    33 */
     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
    49
    510#include "../toolkits/toolkits.h"
    … …  
    1217#include "../solvers/solvers.h"
    1318
     19#ifdef _HAVE_TAO_
     20#include "tao.h"
     21#endif
    1422
    1523void controltao_core(FemModel* femmodel){
    … …  
    4856
    4957        printf("I am in TAO!!\n");
     58        TaoInitialize(0,0,0,0);
    5059
    5160        /*Recover parameters used throughout the solution:{{{1*/

  • issm/trunk/src/c/toolkits/toolkits.h

    r8279 r8285  
    1010#include "./metis/metisincludes.h"
    1111#include "./triangle/triangleincludes.h"
    12 #include "./tao/taoincludes.h"
    1312
    1413#endif
Note: See TracChangeset for help on using the changeset viewer.