Changeset 651

Timestamp:

05/29/09 16:14:06 (16 years ago)

Author:

Mathieu Morlighem

Message:

Remove Dakota from Makefile for now

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (3 diffs)
• parallel/diagnostic.cpp (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -299 +299 @@
                                         ./objects/Result.h\
                                         ./objects/Result.cpp\
-                                        ./objects/DakotaPlugin.h\
-                                        ./objects/DakotaPlugin.cpp\
                                         ./objects/Tria.h\
                                         ./objects/Tria.cpp\
@@ -542 +540 @@
                                         ./parallel/objectivefunctionC.cpp\
                                         ./parallel/GradJCompute.cpp\
-                                        ./parallel/qmu.cpp\
                                         ./parallel/SpawnCore.cpp\
-                                        ./parallel/DakotaResponses.cpp\
                                         ./parallel/ProcessResults.cpp\
                                         ./parallel/OutputResults.cpp
@@ -553 +549 @@
 bin_PROGRAMS = 
 else 
-bin_PROGRAMS = diagnostic.exe  thermal.exe
-#control.exe thermal.exe prognostic.exe
+bin_PROGRAMS = diagnostic.exe  control.exe thermal.exe prognostic.exe
 endif
 

issm/trunk/src/c/parallel/diagnostic.cpp

@@ -101 +101 @@
                 _printf_("calling qmu analysis on diagnostic core:\n");
                 
-                qmu(qmuname,&femmodels[0],inputs,DiagnosticAnalysisEnum(),NoneAnalysisEnum());
+                //qmu(qmuname,&femmodels[0],inputs,DiagnosticAnalysisEnum(),NoneAnalysisEnum());
         }