Changeset 4055 for issm/trunk/src/c/solutions/bedslope.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/bedslope.cpp (modified) (4 diffs)

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

@@ -37 +37 @@
         double   start_init, finish_init;
 
-        int analyses[1]={BedSlopeComputeAnalysisEnum};
-        int solution_type=BedSlopeComputeSolutionEnum;
+        int analyses[1]={SlopeAnalysisEnum};
+        int solution_type=SlopeAnalysisEnum;
 
         MODULEBOOT();
@@ -67 +67 @@
         _printf_("create finite element model, using analyses types statically defined above:\n");
         femmodel=new FemModel(fid,solution_type,analyses,1);
+
+        /*add outputfilename in parameters: */
+        femmodel->parameters->AddObject(new StringParam(OutputFileNameEnum,outputfilename));
         
         /*get parameters: */
@@ -83 +86 @@
 
                 _printf_("write results to disk:\n");
-                OutputResults(femmodel,outputfilename,DiagnosticAnalysisEnum);
+                OutputResults(femmodel->elements, femmodel->loads, femmodel->nodes, femmodel->vertices, femmodel->materials, femmodel->parameters);
         }
         else{
@@ -92 +95 @@
                 #ifdef _HAVE_DAKOTA_ 
                 MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( );
-                Qmux(femmodel,SlopeComputeAnalysisEnum,NoneAnalysisEnum);
+                Qmux(femmodel,BedSlopeAnalysisEnum,NoneAnalysisEnum);
                 MPI_Barrier(MPI_COMM_WORLD); finish_core=MPI_Wtime( );
                 #else