Changeset 3751 for issm/trunk/src/c/parallel/prognostic2.cpp

Timestamp:

05/15/10 19:36:18 (15 years ago)

Author:

Eric.Larour

Message:

Final build that compiles in serial and parallel model

File:

• issm/trunk/src/c/parallel/prognostic2.cpp (modified) (6 diffs)

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

@@ -2 +2 @@
  * \brief: prognostic2 solution
  */ 
-
-#include "../modules.h"
-#include "./parallel.h"
 
 #ifdef HAVE_CONFIG_H
@@ -12 +9 @@
 #endif
 
+#include "../objects/objects.h"
+#include "../shared/shared.h"
+#include "../DataSet/DataSet.h"
+#include "../EnumDefinitions/EnumDefinitions.h"
+#include "../include/globals.h"
+#include "./parallel.h"
 
 int main(int argc,char* *argv){
@@ -32 +35 @@
         Result*  result=NULL;
 
-        ParameterInputs* inputs=NULL;
         Param*   param=NULL;
 
@@ -84 +86 @@
                 _printf_("call computational core:\n");
                 MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( );
-                prognostic2_core(results,model,inputs);
+                prognostic2_core(results,model);
                 MPI_Barrier(MPI_COMM_WORLD); finish_core=MPI_Wtime( );
 
@@ -95 +97 @@
                 #ifdef _HAVE_DAKOTA_ 
                 MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( );
-                Qmux(model,inputs,Prognostic2AnalysisEnum,NoneAnalysisEnum);
+                Qmux(model,Prognostic2AnalysisEnum,NoneAnalysisEnum);
                 MPI_Barrier(MPI_COMM_WORLD); finish_core=MPI_Wtime( );
                 #else
@@ -121 +123 @@
         delete results;
         delete model;
-        delete inputs;
 
         /*Get finish time and close*/