Changeset 1038

Timestamp:

06/22/09 08:23:44 (16 years ago)

Author:

Mathieu Morlighem

Message:

extended control so that it looks like diagnostic

Location:

issm/trunk/src/c

Files:

• ModelProcessorx/CreateDataSets.cpp (modified) (1 diff)
• parallel/control.cpp (modified) (2 diffs)

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

@@ -26 +26 @@
         if (strcmp(model->analysis_type,"control")==0){
 
-                CreateElementsNodesAndMaterialsDiagnosticHoriz(pelements,pnodes,pmaterials, model,model_handle);
-                CreateConstraintsDiagnosticHoriz(pconstraints,model,model_handle);
-                CreateLoadsDiagnosticHoriz(ploads,model,model_handle);
-                CreateParametersControl(pparameters,model,model_handle);
-                                        
+                if (strcmp(model->sub_analysis_type,"horiz")==0){
+
+                        CreateElementsNodesAndMaterialsDiagnosticHoriz(pelements,pnodes,pmaterials, model,model_handle);
+                        CreateConstraintsDiagnosticHoriz(pconstraints,model,model_handle);
+                        CreateLoadsDiagnosticHoriz(ploads,model,model_handle);
+                        CreateParametersControl(pparameters,model,model_handle);
+
+                }
+                else if (strcmp(model->sub_analysis_type,"vert")==0){
+
+                        CreateElementsNodesAndMaterialsDiagnosticVert(pelements,pnodes,pmaterials, model,model_handle);
+                        CreateConstraintsDiagnosticVert(pconstraints,model,model_handle);
+                        CreateLoadsDiagnosticVert(ploads,model,model_handle);
+                        CreateParametersControl(pparameters,model,model_handle);
+
+                }
+                else if (strcmp(model->sub_analysis_type,"stokes")==0){
+
+                        CreateElementsNodesAndMaterialsDiagnosticStokes(pelements,pnodes,pmaterials, model,model_handle);
+                        CreateConstraintsDiagnosticStokes(pconstraints,model,model_handle);
+                        CreateLoadsDiagnosticStokes(ploads,model,model_handle);
+                        CreateParametersControl(pparameters,model,model_handle);
+
+                }
+                else if (strcmp(model->sub_analysis_type,"hutter")==0){
+
+                        CreateElementsNodesAndMaterialsDiagnosticHutter(pelements,pnodes,pmaterials, model,model_handle);
+                        CreateConstraintsDiagnosticHutter(pconstraints,model,model_handle);
+                        CreateLoadsDiagnosticHutter(ploads,model,model_handle);
+                        CreateParametersControl(pparameters,model,model_handle);
+
+                }
+
         }
         else if (strcmp(model->analysis_type,"diagnostic")==0){

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

@@ -26 +26 @@
 
         /*Fem models : */
-        FemModel femmodels[1];
+        FemModel femmodels[5];
 
         /*Results: */
@@ -60 +60 @@
 
         _printf_("read and create finite element model:\n");
-        _printf_("\n   reading diagnostic horiz model data:\n");
-        CreateFemModel(&femmodels[0],fid,"control","");
+        _printf_("\n   reading control horiz model data:\n");
+        CreateFemModel(&femmodels[0],fid,"control","horiz");
+        _printf_("\n   reading control vert model data:\n");
+        CreateFemModel(&femmodels[1],fid,"control","vert");
+        _printf_("\n   reading control stokes model data:\n");
+        CreateFemModel(&femmodels[2],fid,"control","stokes");
+        _printf_("\n   reading control hutter model data:\n");
+        CreateFemModel(&femmodels[3],fid,"control","hutter");
+        _printf_("\n   reading surface and bed slope computation model data:\n");
+        CreateFemModel(&femmodels[4],fid,"slope_compute","");
 
         _printf_("initialize inputs:\n");