Changeset 1886

Timestamp:

08/25/09 14:07:38 (16 years ago)

Author:

Eric.Larour

Message:

NoneAnalysisEnum not necessary to add a formulation

Location:

issm/trunk/src/c

Files:

• objects/Model.cpp (modified) (1 diff)
• objects/Model.h (modified) (1 diff)
• parallel/control.cpp (modified) (1 diff)
• parallel/diagnostic.cpp (modified) (2 diffs)
• parallel/diagnostic_core.cpp (modified) (1 diff)
• parallel/prognostic.cpp (modified) (1 diff)
• parallel/steadystate.cpp (modified) (1 diff)
• parallel/transient.cpp (modified) (1 diff)

issm/trunk/src/c/objects/Model.cpp

@@ -123 +123 @@
 }
 
+#undef __FUNCT__
+#define __FUNCT__ "Model::AddFormulation"
+void  Model::AddFormulation(ConstDataHandle MODEL, int analysis_type){
+
+        /*FemModel: */
+        FemModel*           femmodel=NULL;
+        DataSet*            elements=NULL;
+        DataSet*            nodes=NULL;
+        DataSet*            constraints=NULL;
+        DataSet*            loads=NULL;
+        DataSet*            materials=NULL;
+        DataSet*            parameters=NULL;
+        Vec                 partition=NULL;
+        Vec                 tpartition=NULL;
+        Vec                 yg=NULL;
+        Mat                 Rmg=NULL;
+        Mat                 Gmn=NULL;
+        NodeSets*           nodesets=NULL;
+        Vec                 ys=NULL;
+        Vec                 ys0=NULL;
+
+        /*intermediary: */
+        IoModel* iomodel=NULL;
+        int sub_analysis_type;
+        
+        _printf_("   fill model with matlab workspace data\n");
+        IoModelInit(&iomodel,MODEL); 
+
+        _printf_("   specifying analysis\n");
+        if (analysis_type!=0){
+                iomodel->analysis_type=analysis_type;
+        }
+        /*sub_analysis_type should default to none, as it was not specified: */
+        sub_analysis_type=NoneAnalysisEnum();
+        
+        if (sub_analysis_type!=0){
+                iomodel->sub_analysis_type=sub_analysis_type;
+        }
+
+        _printf_("   create datasets:\n");
+        CreateDataSets(&elements,&nodes,&materials,&constraints,&loads,&parameters,iomodel,MODEL);
+
+        _printf_("   create degrees of freedom: \n");
+        Dofx( &partition,&tpartition,elements,nodes, parameters);
+        
+        _printf_("   create single point constraints: \n");
+        SpcNodesx( &yg, nodes,constraints); 
+        
+        _printf_("   create rigid body constraints:\n");
+        MpcNodesx( &Rmg, nodes,constraints); 
+        
+        _printf_("   create node sets:\n");
+        BuildNodeSetsx(&nodesets, nodes);
+
+        _printf_("   reducing single point constraints vector:\n");
+        Reducevectorgtosx(&ys,&ys0, yg,nodesets);
+        
+        _printf_("   normalizing rigid body constraints matrix:\n");
+        NormalizeConstraintsx(&Gmn, Rmg,nodesets);
+
+        _printf_("   configuring element and loads:\n");
+        ConfigureObjectsx(elements, loads, nodes, materials);
+
+        _printf_("   process parameters:\n");
+        ProcessParamsx( parameters, partition);
+
+        _printf_("   free ressources:\n");
+        DeleteIoModel(&iomodel);
+
+        /*Use all the data created to create an femmodel: */
+        femmodel=new FemModel(elements,nodes,constraints,loads,materials,parameters,
+                                      partition,tpartition,yg,Rmg,Gmn,nodesets,ys,ys0);
+
+        /*Add to femmodels in model: */
+        femmodels->AddObject((Object*)femmodel);
+
+}
 
 #undef __FUNCT__

issm/trunk/src/c/objects/Model.h

@@ -30 +30 @@
 
                 void  AddFormulation(ConstDataHandle MODEL, int analysis_type,int sub_analysis_type);
+                void  AddFormulation(ConstDataHandle MODEL, int analysis_type);
 
                 /*all overloaded forms of the FindParam routine: */

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

@@ -83 +83 @@
         
         _printf_("\n   reading surface and bed slope computation model data:\n");
-        model->AddFormulation(fid,SlopeComputeAnalysisEnum(),NoneAnalysisEnum());
+        model->AddFormulation(fid,SlopeComputeAnalysisEnum());
 
         _printf_("initialize inputs:\n");

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

@@ -76 +76 @@
         
         _printf_("\n   reading surface and bed slope computation model data:\n");
-        model->AddFormulation(fid,SlopeComputeAnalysisEnum(),NoneAnalysisEnum());
+        model->AddFormulation(fid,SlopeComputeAnalysisEnum());
 
         _printf_("initialize inputs:\n");
         model->FindParam(&u_g_initial,"u_g",DiagnosticAnalysisEnum(),HorizAnalysisEnum());
         model->FindParam(&numberofnodes,"numberofnodes");
+        model->FindParam(&qmu_analysis,"qmu_analysis");
 
         inputs=new ParameterInputs;
@@ -89 +90 @@
 
         /*are we running the solution sequence, or a qmu wrapper around it? : */
-        model->FindParam(&qmu_analysis,"qmu_analysis");
-        
         if(!qmu_analysis){
 

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

@@ -73 +73 @@
         fem_ds=model->GetFormulation(DiagnosticAnalysisEnum(),StokesAnalysisEnum());
         fem_dhu=model->GetFormulation(DiagnosticAnalysisEnum(),HutterAnalysisEnum());
-        fem_sl=model->GetFormulation(SlopeComputeAnalysisEnum(),NoneAnalysisEnum());
+        fem_sl=model->GetFormulation(SlopeComputeAnalysisEnum());
 
         //specific parameters for specific models

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

@@ -72 +72 @@
 
         _printf_("read and create finite element model:\n");
-        model->AddFormulation(fid,PrognosticAnalysisEnum(),NoneAnalysisEnum());
+        model->AddFormulation(fid,PrognosticAnalysisEnum());
 
         //retrieve parameters used to fill inputs

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

@@ -82 +82 @@
         
         _printf_("\n   reading surface and bed slope computation model data:\n");
-        model->AddFormulation(fid,SlopeComputeAnalysisEnum(),NoneAnalysisEnum());
+        model->AddFormulation(fid,SlopeComputeAnalysisEnum());
 
         _printf_("\n   read and create thermal finite element model:\n");

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

@@ -85 +85 @@
         
         _printf_("\n   reading surface and bed slope computation model data:\n");
-        model->AddFormulation(fid,SlopeComputeAnalysisEnum(),NoneAnalysisEnum());
+        model->AddFormulation(fid,SlopeComputeAnalysisEnum());
 
         _printf_("\n   reading prognositc model data:\n");
-        model->AddFormulation(fid,PrognosticAnalysisEnum(),NoneAnalysisEnum());
+        model->AddFormulation(fid,PrognosticAnalysisEnum());
         
         /*Do we run in 3d?, in which case we need thermal and melting also:*/