Changeset 8279 for issm/trunk

Timestamp:

05/13/11 15:46:44 (14 years ago)

Author:

Mathieu Morlighem

Message:

working on TAO applied to control methods

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (5 diffs)
• shared/Matlab/ModuleBoot.cpp (modified) (1 diff)
• solutions/controltao_core.cpp (added)
• solutions/issm.cpp (modified) (1 diff)
• solutions/solutions.h (modified) (1 diff)
• toolkits/tao (added)
• toolkits/tao/taoincludes.h (added)
• toolkits/toolkits.h (modified) (1 diff)

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

@@ -1 @@
-INCLUDES = @DAKOTAINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@  @METISINCL@  @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@  @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@  @TRIANGLEINCL@ @HYPREINCL@ @MLINCL@ 
+INCLUDES = @DAKOTAINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@  @METISINCL@  @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@  @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@  @TRIANGLEINCL@ @HYPREINCL@ @MLINCL@ @TAOINCL@
 
 #Compile serial library, and then try and compile parallel library
@@ -375 +375 @@
                                         ./toolkits/petsc/patches/MatMultPatch.cpp\
                                         ./toolkits/petsc/petscincludes.h\
+                                        ./toolkits/tao/taoincludes.h\
                                         ./toolkits/mpi/mpiincludes.h\
                                         ./toolkits/mpi/patches/mpipatches.h\
@@ -1015 +1016 @@
                                         ./toolkits/petsc/patches/MatMultPatch.cpp\
                                         ./toolkits/petsc/petscincludes.h\
+                                        ./toolkits/tao/taoincludes.h\
                                         ./toolkits/mpi/mpiincludes.h\
                                         ./toolkits/mpi/patches/mpipatches.h\
@@ -1285 +1287 @@
                                         ./solutions/WriteLockFile.cpp\
                                         ./solutions/control_core.cpp\
+                                        ./solutions/controltao_core.cpp\
                                         ./solutions/controlrestart.cpp\
                                         ./solutions/controlconvergence.cpp\
@@ -1325 +1328 @@
 endif
 
-LDADD =    ./libpISSM.a $(PETSCLIB)     $(FLIBS)  $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB) $(HYPRELIB) $(MLLIB)   $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB)  $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) libOverload.a $(MULTITHREADINGLIB)
+LDADD =    ./libpISSM.a $(PETSCLIB) $(TAOLIB) $(FLIBS) $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB)  $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) libOverload.a $(MULTITHREADINGLIB)
 
 issm_exe_SOURCES = solutions/issm.cpp

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

@@ -24 +24 @@
         PetscInitializeNoArguments();
 
+        /*Initialize Tao*/
+        #ifdef _HAVE_TAO_
+        TaoInitialize(0,0,0,0);
+        #endif
+
         return 1;
 }

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

@@ -79 +79 @@
 
         /*if control is being run on top of a solution, change core: */
-        if(control_analysis)solutioncore=&control_core;
+        if(control_analysis){
+                #ifdef _HAVE_TAO_
+                solutioncore=&controltao_core;
+                #else
+                solutioncore=&control_core;
+                #endif
+        }
 
         /*are we running the solution sequence, or a qmu wrapper around it? : */

issm/trunk/src/c/solutions/solutions.h ¶

@@ -24 +24 @@
 void bedslope_core(FemModel* femmodel);
 void control_core(FemModel* femmodel);
+void controltao_core(FemModel* femmodel);
 void prognostic_core(FemModel* femmodel);
 void balancedthickness_core(FemModel* femmodel);

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

@@ -10 +10 @@
 #include "./metis/metisincludes.h"
 #include "./triangle/triangleincludes.h"
+#include "./tao/taoincludes.h"
 
 #endif