Changeset 16550

Timestamp:

10/25/13 15:31:24 (11 years ago)

Author:

Mathieu Morlighem

Message:

DEL: getting rid of CreateDatasets

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• modules/ModelProcessorx/CreateDataSets.cpp (deleted)
• modules/ModelProcessorx/ModelProcessorx.cpp (modified) (2 diffs)
• modules/ModelProcessorx/ModelProcessorx.h (modified) (2 diffs)
• modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -246 +246 @@
                                         ./modules/ModelProcessorx/EdgesPartitioning.cpp\
                                         ./modules/ModelProcessorx/FacesPartitioning.cpp\
-                                        ./modules/ModelProcessorx/CreateDataSets.cpp\
                                         ./modules/ModelProcessorx/CreateParameters.cpp\
                                         ./modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp\

issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp

@@ -13 +13 @@
 #include "./ModelProcessorx.h"
 
-void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads, Parameters** pparameters, FILE* IOMODEL,FILE* toolkitfile, char* rootpath,const int solution_enum,const int nummodels,const int* analysis_type_list){
+void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads, Parameters** pparameters, FILE* IOMODEL,FILE* toolkitfile, char* rootpath,const int solution_enum,const int nummodels,const int* analysis_enum_list){
 
-        int   i,analysis_type,verbose;
+        int   i,analysis_enum,verbose;
         bool  isthermal,ismasstransport,isstressbalance,isgroundingline,isenthalpy;
 
@@ -53 +53 @@
         for(i=0;i<nummodels;i++){
 
-                analysis_type=analysis_type_list[i];
+                analysis_enum=analysis_enum_list[i];
                 parameters->AddObject(new IntParam(AnalysisCounterEnum,i));
 
                 /*Hack for trasient runs (FIXME: to be improved)*/
-                if(solution_enum==TransientSolutionEnum && analysis_type==ThermalAnalysisEnum  && iomodel->meshtype==Mesh2DhorizontalEnum) continue;
-                if(solution_enum==TransientSolutionEnum && analysis_type==MeltingAnalysisEnum  && iomodel->meshtype==Mesh2DhorizontalEnum) continue;
-                if(solution_enum==TransientSolutionEnum && analysis_type==EnthalpyAnalysisEnum && iomodel->meshtype==Mesh2DhorizontalEnum) continue;
-                if(solution_enum==TransientSolutionEnum && analysis_type==ThermalAnalysisEnum && isthermal==false) continue;
-                if(solution_enum==TransientSolutionEnum && analysis_type==MeltingAnalysisEnum && isthermal==false) continue;
-                if(solution_enum==TransientSolutionEnum && analysis_type==EnthalpyAnalysisEnum && isthermal==false) continue;
-                if(solution_enum==TransientSolutionEnum && analysis_type==ThermalAnalysisEnum && isenthalpy==true) continue;
-                if(solution_enum==TransientSolutionEnum && analysis_type==MeltingAnalysisEnum && isenthalpy==true) continue;
-                if(solution_enum==TransientSolutionEnum && analysis_type==EnthalpyAnalysisEnum && isenthalpy==false) continue;
-                if(solution_enum==TransientSolutionEnum && analysis_type==MasstransportAnalysisEnum && ismasstransport==false && isgroundingline==false) continue;
-                if(solution_enum==TransientSolutionEnum && analysis_type==StressbalanceAnalysisEnum && isstressbalance==false) continue;
-                if(solution_enum==TransientSolutionEnum && analysis_type==StressbalanceVerticalAnalysisEnum && isstressbalance==false) continue;
-                if(solution_enum==TransientSolutionEnum && analysis_type==StressbalanceSIAAnalysisEnum && isstressbalance==false) continue;
-                if(solution_enum==SteadystateSolutionEnum && analysis_type==ThermalAnalysisEnum && isenthalpy==true) continue;
-                if(solution_enum==SteadystateSolutionEnum && analysis_type==MeltingAnalysisEnum && isenthalpy==true) continue;
-                if(solution_enum==SteadystateSolutionEnum && analysis_type==EnthalpyAnalysisEnum && isenthalpy==false) continue;
+                if(solution_enum==TransientSolutionEnum && analysis_enum==ThermalAnalysisEnum  && iomodel->meshtype==Mesh2DhorizontalEnum) continue;
+                if(solution_enum==TransientSolutionEnum && analysis_enum==MeltingAnalysisEnum  && iomodel->meshtype==Mesh2DhorizontalEnum) continue;
+                if(solution_enum==TransientSolutionEnum && analysis_enum==EnthalpyAnalysisEnum && iomodel->meshtype==Mesh2DhorizontalEnum) continue;
+                if(solution_enum==TransientSolutionEnum && analysis_enum==ThermalAnalysisEnum && isthermal==false) continue;
+                if(solution_enum==TransientSolutionEnum && analysis_enum==MeltingAnalysisEnum && isthermal==false) continue;
+                if(solution_enum==TransientSolutionEnum && analysis_enum==EnthalpyAnalysisEnum && isthermal==false) continue;
+                if(solution_enum==TransientSolutionEnum && analysis_enum==ThermalAnalysisEnum && isenthalpy==true) continue;
+                if(solution_enum==TransientSolutionEnum && analysis_enum==MeltingAnalysisEnum && isenthalpy==true) continue;
+                if(solution_enum==TransientSolutionEnum && analysis_enum==EnthalpyAnalysisEnum && isenthalpy==false) continue;
+                if(solution_enum==TransientSolutionEnum && analysis_enum==MasstransportAnalysisEnum && ismasstransport==false && isgroundingline==false) continue;
+                if(solution_enum==TransientSolutionEnum && analysis_enum==StressbalanceAnalysisEnum && isstressbalance==false) continue;
+                if(solution_enum==TransientSolutionEnum && analysis_enum==StressbalanceVerticalAnalysisEnum && isstressbalance==false) continue;
+                if(solution_enum==TransientSolutionEnum && analysis_enum==StressbalanceSIAAnalysisEnum && isstressbalance==false) continue;
+                if(solution_enum==SteadystateSolutionEnum && analysis_enum==ThermalAnalysisEnum && isenthalpy==true) continue;
+                if(solution_enum==SteadystateSolutionEnum && analysis_enum==MeltingAnalysisEnum && isenthalpy==true) continue;
+                if(solution_enum==SteadystateSolutionEnum && analysis_enum==EnthalpyAnalysisEnum && isenthalpy==false) continue;
 
-                if(VerboseMProcessor()) _printf0_("   creating datasets for analysis " << EnumToStringx(analysis_type) << "\n");
-                CreateDataSets(elements,nodes,vertices,materials,constraints,loads,parameters,iomodel,toolkitfile,rootpath,solution_enum,analysis_type,nummodels,i);
+                if(VerboseMProcessor()) _printf0_("   creating datasets for analysis " << EnumToStringx(analysis_enum) << "\n");
+                Analysis* analysis = EnumToAnalysis(analysis_enum);
+                analysis->UpdateParameters(parameters,iomodel,solution_enum,analysis_enum);
+                analysis->CreateNodes(nodes,iomodel);
+                analysis->CreateConstraints(constraints,iomodel);
+                analysis->CreateLoads(loads,iomodel);
+                analysis->UpdateElements(elements,iomodel,i,analysis_enum);
+                delete analysis;
+
+
+                /* Update counters, because we have created more nodes, loads and
+                 * constraints, and ids for objects created in next call to CreateDataSets
+                 * will need to start at the end of the updated counters: */
+                iomodel->nodecounter       = nodes->MaximumId();
+                iomodel->loadcounter       = loads->NumberOfLoads();
+                iomodel->constraintcounter = constraints->NumberOfConstraints();
         }
+
+        /*Solution specific updates*/
+        #ifdef _HAVE_CONTROL_
+        UpdateElementsAndMaterialsControl(elements,materials,iomodel);
+        #endif
+        #ifdef _HAVE_DAKOTA_
+        UpdateElementsAndMaterialsDakota(elements,materials,iomodel);
+        #endif
+        #ifdef _HAVE_TRANSIENT_
+        if(solution_enum==TransientSolutionEnum){
+                UpdateElementsTransient(elements,parameters,iomodel,analysis_enum);
+        }
+        #endif
 
         /* Sort datasets:

issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h

@@ -12 +12 @@
 
 /*Creation of fem datasets: general drivers*/
-void CreateDataSets(Elements* elements,Nodes* nodes,Vertices* vertices, Materials* materials, Constraints* constraints, Loads* loads,Parameters* parameters,IoModel* iomodel,FILE* toolkitfile,char* rootpath,const int solution_type,int analysis_type,const int nummodels,int analysis_counter);
 void CreateElementsVerticesAndMaterials(Elements* elements,Vertices* vertices,Materials* materials, IoModel* iomodel,const int nummodels);
 void CreateParameters(Parameters*parameters,IoModel* iomodel,char* rootpath,FILE* toolkitfile,const int solution_type);
@@ -21 +20 @@
 void UpdateElementsAndMaterialsControl(Elements* elements,Materials* materials, IoModel* iomodel);
 void UpdateElementsAndMaterialsDakota(Elements* elements,Materials* materials, IoModel* iomodel);
-void UpdateElementsTransient(Elements* elements,Parameters* parameters,IoModel* iomodel,int analysis_counter,int analysis_type);
+void UpdateElementsTransient(Elements* elements,Parameters* parameters,IoModel* iomodel,int analysis_type);
 void CreateNodes(Nodes*nodes, IoModel* iomodel,int analysis,int finite_element,int approximation=NoneApproximationEnum);
 

issm/trunk-jpl/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp

@@ -9 +9 @@
 #include "../ModelProcessorx.h"
 
-void    UpdateElementsTransient(Elements* elements, Parameters* parameters,IoModel* iomodel,int analysis_counter,int analysis_type){
+void    UpdateElementsTransient(Elements* elements, Parameters* parameters,IoModel* iomodel,int analysis_type){
 
         bool isgroundingline;