Changeset 4055 for issm/trunk/src/c/solutions/diagnostic.cpp

Timestamp:

06/18/10 19:24:59 (15 years ago)

Author:

Eric.Larour

Message:

Keep simplifying solutions.
New convergence module at the input level, instead at the solution level, when solution vectors are not
available anymore.

File:

• issm/trunk/src/c/solutions/diagnostic.cpp (modified) (4 diffs)

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

@@ -36 +36 @@
         double   start_init, finish_init;
 
-        int analyses[5]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SlopeComputeAnalysisEnum};
+        int analyses[5]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SlopeAnalysisEnum};
         int solution_type=DiagnosticAnalysisEnum;
 
@@ -58 +58 @@
         lockname=argv[4];
 
-        /*Initialize femmodel structure: */
         MPI_Barrier(MPI_COMM_WORLD); start_init=MPI_Wtime();
 
@@ -66 +65 @@
         _printf_("create finite element model:\n");
         femmodel=new FemModel(fid,solution_type,analyses,5);
+
+        /*add outputfilename in parameters: */
+        femmodel->parameters->AddObject(new StringParam(OutputFileNameEnum,outputfilename));
         
         /*get parameters: */
@@ -94 +96 @@
 
                 _printf_("write results to disk:\n");
-                OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters, outputfilename);
+                OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters);
         }
         else{