Changeset 3774

Timestamp:

05/17/10 10:36:01 (15 years ago)

Author:

seroussi

Message:

analysis_type needed in parameters

Location:

issm/trunk/src/c

Files:

• ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• parallel/prognostic_core.cpp (modified) (1 diff)

issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp

@@ -30 +30 @@
         if (strcmp(iomodel->meshtype,"2d")==0) parameters->AddObject(new IntParam(DimEnum,2));
         else parameters->AddObject(new IntParam(DimEnum,3));
+        parameters->AddObject(new    IntParam(AnalysisTypeEnum,iomodel->analysis_type));
+        parameters->AddObject(new    IntParam(SubAnalysisTypeEnum,iomodel->sub_analysis_type));
         parameters->AddObject(new StringParam(OutputFileNameEnum,iomodel->outputfilename));
         parameters->AddObject(new   BoolParam(IsHutterEnum,iomodel->ishutter));

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

@@ -34 +34 @@
 
         /*recover fem model: */
-        fem_p=model->GetFormulation(PrognosticAnalysisEnum);
+        fem_p=model->GetFormulation(PrognosticAnalysisEnum); ISSMASSERT(fem_p);
 
         //first recover parameters common to all solutions