Changeset 8385

Timestamp:

05/20/11 21:09:00 (14 years ago)

Author:

Mathieu Morlighem

Message:

trunk: TAO successfully initialized

Location:

issm/trunk/src/c

Files:

• modules/modules.h (modified) (1 diff)
• solutions/controltao_core.cpp (modified) (2 diffs)

issm/trunk/src/c/modules/modules.h

@@ -1 @@
-/*! \file issm.h: 
+/*! \file modules.h: 
  *  \brief header file for all the ISSM modules
  */

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

@@ -2 +2 @@
  * \brief: core of the control solution 
  */ 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#else
-#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
-#endif
-
-#include "../toolkits/toolkits.h"
-#include "../objects/objects.h"
-#include "../shared/shared.h"
-#include "../EnumDefinitions/EnumDefinitions.h"
-#include "./solutions.h"
-#include "../modules/modules.h"
-#include "../include/include.h"
-#include "../solvers/solvers.h"
-
+#include "../issm.h"
 #ifdef _HAVE_TAO_
 #include "tao.h"
@@ -55 +41 @@
         double* J=NULL;
 
-        printf("I am in TAO!!\n");
-        TaoInitialize(0,0,0,0);
+#ifdef _HAVE_TAO_
+        int argc;
+        char **args;
+        PetscGetArgs(&argc,&args);
+        int ierr=TaoInitialize(&argc,&args,(char*)0,"");
+        if(ierr) _error_("Could not initialize Tao");
+#endif
 
         /*Recover parameters used throughout the solution:{{{1*/