Changeset 23488

Timestamp:

11/29/18 17:08:07 (6 years ago)

Author:

Mathieu Morlighem

Message:

NEW: loads are now an array, analysis specific

Location:

issm/trunk-jpl/src/c

Files:

• classes/FemModel.cpp (modified) (15 diffs)
• classes/FemModel.h (modified) (2 diffs)
• classes/Loads/Loads.cpp (modified) (2 diffs)
• modules/ModelProcessorx/ModelProcessorx.cpp (modified) (6 diffs)
• modules/ModelProcessorx/ModelProcessorx.h (modified) (1 diff)
• modules/SystemMatricesx/SystemMatricesx.cpp (modified) (1 diff)
• solutionsequences/solutionsequence_nonlinear.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -188 +188 @@
                 xDelete<Constraints*>(constraints_list);
         }
-        if(loads)delete loads;
+        if(this->loads_list && this->nummodels){
+                for(int i=0;i<this->nummodels;i++) delete this->loads_list[i];
+                xDelete<Loads*>(loads_list);
+        }
         if(materials)delete materials;
         if(parameters)delete parameters;
@@ -324 +327 @@
         /*Analysis dependent arrays*/
         output->constraints_list=xNew<Constraints*>(this->nummodels);
+        output->loads_list=xNew<Loads*>(this->nummodels);
 
         output->profiler=static_cast<Profiler*>(this->profiler->copy());
 
-        output->loads=static_cast<Loads*>(this->loads->Copy());
         output->materials=static_cast<Materials*>(this->materials->Copy());
         output->parameters=static_cast<Parameters*>(this->parameters->Copy());
         output->results=static_cast<Results*>(this->results->Copy());
-
         output->nodes=static_cast<Nodes*>(this->nodes->Copy());
         output->vertices=static_cast<Vertices*>(this->vertices->Copy());
@@ -344 +346 @@
         for(i=0;i<nummodels;i++){
                 output->constraints_list[i] = static_cast<Constraints*>(this->constraints_list[i]->Copy());
+                output->loads_list[i] = static_cast<Loads*>(this->loads_list[i]->Copy());
                 analysis_type=output->analysis_type_list[i];
                 output->SetCurrentConfiguration(analysis_type);
@@ -349 +352 @@
                 SpcNodesx(output->nodes,output->constraints_list[i],output->parameters,analysis_type);
                 NodesDofx(output->nodes,output->parameters,analysis_type);
-                ConfigureObjectsx(output->elements,output->loads,output->nodes,output->vertices,output->materials,output->parameters);
+                ConfigureObjectsx(output->elements,output->loads_list[i],output->nodes,output->vertices,output->materials,output->parameters);
         }
 
@@ -423 +426 @@
 
         /*create datasets for all analyses*/
-        ModelProcessorx(&this->elements,&this->nodes,&this->vertices,&this->materials,&this->constraints_list,&this->loads,&this->parameters,iomodel,toolkitsoptionsfid,rootpath,this->solution_type,this->nummodels,this->analysis_type_list);
+        ModelProcessorx(&this->elements,&this->nodes,&this->vertices,&this->materials,&this->constraints_list,&this->loads_list,&this->parameters,iomodel,toolkitsoptionsfid,rootpath,this->solution_type,this->nummodels,this->analysis_type_list);
 
         /*do the post-processing of the datasets to get an FemModel that can actually run analyses: */
@@ -432 +435 @@
 
                 if(VerboseMProcessor()) _printf0_("      configuring element and loads\n");
-                ConfigureObjectsx(elements, loads, nodes, vertices, materials,parameters);
+                ConfigureObjectsx(this->elements,this->loads,this->nodes,this->vertices,this->materials,this->parameters);
 
                 if(i==0){
@@ -458 +461 @@
 
         if(marshall_direction==MARSHALLING_BACKWARD){
-                delete this->loads;
                 delete this->materials;
                 delete this->parameters;
@@ -464 +466 @@
                         for(i=0;i<this->nummodels;i++) delete this->constraints_list[i];
                         xDelete<Constraints*>(constraints_list);
+                }
+                if(this->loads_list && this->nummodels){
+                        for(i=0;i<this->nummodels;i++) delete this->loads_list[i];
+                        xDelete<Loads*>(loads_list);
                 }
                 delete this->results;
@@ -487 +493 @@
         MARSHALLING_DYNAMIC(analysis_type_list,int,nummodels);
 
-        this->loads->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
         this->materials->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
         this->parameters->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
@@ -498 +503 @@
                 this->constraints_list = xNew<Constraints*>(this->nummodels);
                 for(i=0;i<nummodels;i++) this->constraints_list[i] = new Constraints();
+                this->loads_list = xNew<Loads*>(this->nummodels);
+                for(i=0;i<nummodels;i++) this->loads_list[i] = new Loads();
         }
 
         for(i=0;i<nummodels;i++){
                 this->constraints_list[i]->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
+                this->loads_list[i]->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
         }
 
@@ -517 +525 @@
                         SpcNodesx(this->nodes,this->constraints_list[i],this->parameters,analysis_type);
                         NodesDofx(this->nodes,this->parameters,analysis_type);
-                        ConfigureObjectsx(this->elements,this->loads,this->nodes,this->vertices,this->materials,this->parameters);
+                        ConfigureObjectsx(this->elements,this->loads_list[i],this->nodes,this->vertices,this->materials,this->parameters);
                 }
 
@@ -598 +606 @@
 
         /*configure elements, loads and nodes, for this new analysis: */
+        this->loads = this->loads_list[this->analysis_counter];
+        this->constraints = this->constraints_list[this->analysis_counter];
+        this->loads->SetCurrentConfiguration(elements, loads, nodes,vertices, materials,parameters);
         this->elements->SetCurrentConfiguration(elements,loads, nodes,vertices, materials,parameters);
-        this->loads->SetCurrentConfiguration(elements, loads, nodes,vertices, materials,parameters);
-        this->constraints = this->constraints_list[this->analysis_counter];
 
         /*take care of toolkits options, that depend on this analysis type (present only after model processor)*/
@@ -2614 +2623 @@
         this->ElementsAndVerticesPartitioning(newnumberofvertices,newnumberofelements,elementswidth,newelementslist,&my_elements,&my_vertices);
 
-        if(this->loads->Size()!=0) _error_("not supported yet");
-
         /*Create vertices*/
         Vertices* new_vertices=new Vertices();
@@ -2639 +2646 @@
         for(int i=0;i<this->nummodels;i++){//create nodes for each analysis in analysis_type_list
 
+                if(this->loads_list[i]->Size()!=0) _error_("not supported yet");
                 new_constraints_list[i] = new Constraints();
 
@@ -2661 +2669 @@
         new_nodes->Presort();
         new_vertices->Presort();
-        this->loads->Presort();
+        //this->loads->Presort();
         new_materials->Presort();
 
         /*reset hooks for elements, loads and nodes: */
         new_elements->ResetHooks();
-        this->loads->ResetHooks();
+        //this->loads->ResetHooks();
         new_materials->ResetHooks();
 

issm/trunk-jpl/src/c/classes/FemModel.h

@@ -42 +42 @@
 
                 Elements    *elements;             //elements (one set for all analyses)
-                Loads       *loads;                //one set of constraints. each constraint knows which analysis_type it handles
                 Materials   *materials;            //one set of materials, for each element
                 Nodes       *nodes;                //one set of nodes
@@ -52 +51 @@
                 Constraints  *constraints;
                 Constraints **constraints_list;
+                Loads        *loads;
+                Loads       **loads_list;
 
                 //FIXME: do we want only one class and have virtual functions? or keep 2 classes, at least rename AdaptiveMeshRefinement -> AmrNeopz

issm/trunk-jpl/src/c/classes/Loads/Loads.cpp

@@ -121 +121 @@
 
                 /*Check that this load corresponds to our analysis currently being carried out: */
-                if (load->InAnalysis(analysis_type)) localloads++;
+                _assert_(load->InAnalysis(analysis_type));
+                localloads++;
         }
 
@@ -174 +175 @@
 
                 /*Check that this load corresponds to our analysis currently being carried out: */
-                if (load->InAnalysis(analysis_type)) localloads++;
+                _assert_(load->InAnalysis(analysis_type));
+                localloads++;
         }
 

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,IoModel* iomodel,FILE* toolkitfile, char* rootpath,const int solution_enum,const int nummodels,const int* analysis_enum_list){
+void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints*** pconstraints, Loads*** ploads, Parameters** pparameters,IoModel* iomodel,FILE* toolkitfile, char* rootpath,const int solution_enum,const int nummodels,const int* analysis_enum_list){
 
         /*Set Verbosity once for all*/
@@ -28 +28 @@
         Vertices    *vertices    = new Vertices();
         Materials   *materials   = new Materials();
-        Loads       *loads       = new Loads();
         Parameters  *parameters  = new Parameters();
 
         Constraints **constraints = xNew<Constraints*>(nummodels);
         for(int i=0;i<nummodels;i++) constraints[i] = new Constraints();
+        Loads **loads = xNew<Loads*>(nummodels);
+        for(int i=0;i<nummodels;i++) loads[i] = new Loads();
 
 
@@ -56 +57 @@
                 analysis->CreateNodes(nodes,iomodel);
                 analysis->CreateConstraints(constraints[i],iomodel);
-                analysis->CreateLoads(loads,iomodel);
+                analysis->CreateLoads(loads[i],iomodel);
                 analysis->UpdateElements(elements,iomodel,i,analysis_enum);
                 delete analysis;
@@ -64 +65 @@
                  * will need to start at the end of the updated counters: */
                 if(nodes->Size()) iomodel->nodecounter = nodes->MaximumId();
-                iomodel->loadcounter       = loads->NumberOfLoads();
+                iomodel->loadcounter       = loads[i]->NumberOfLoads();
                 iomodel->constraintcounter = constraints[i]->NumberOfConstraints();
 
@@ -70 +71 @@
                 _assert_(iomodel->nodecounter>=0);
 
-                /*Tell constraints that Ids are already sorted*/
+                /*Tell datasets that Ids are already sorted*/
                 constraints[i]->Presort();
+                loads[i]->Presort();
         }
 
@@ -94 +96 @@
         nodes->Presort();
         vertices->Presort();
-        loads->Presort();
         materials->Presort();
 

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

@@ -9 +9 @@
 #include "../../analyses/analyses.h"
 
-void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints*** pconstraints, Loads** ploads, Parameters** pparameters,IoModel* iomodel,FILE* toolkitfile, char* rootpath,const int solution_type,const int nummodels,const int* analysis_type_listh);
+void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints*** pconstraints, Loads*** ploads, Parameters** pparameters,IoModel* iomodel,FILE* toolkitfile, char* rootpath,const int solution_type,const int nummodels,const int* analysis_type_listh);
 
 /*Creation of fem datasets: general drivers*/

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

@@ -99 +99 @@
                 for (i=0;i<femmodel->loads->Size();i++){
                         load=xDynamicCast<Load*>(femmodel->loads->GetObjectByOffset(i));
-                        if(load->InAnalysis(configuration_type)){
-                                load->PenaltyCreateKMatrix(Kff,Kfs,kmax);
-                                load->PenaltyCreatePVector(pf,kmax);
-                        }
+                        _assert_(load->InAnalysis(configuration_type)); 
+                        load->PenaltyCreateKMatrix(Kff,Kfs,kmax);
+                        load->PenaltyCreatePVector(pf,kmax);
                 }
         }

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_nonlinear.cpp

@@ -109 +109 @@
         if(conserve_loads){
                 delete femmodel->loads;
+                int index=femmodel->AnalysisIndex(configuration_type);
+                femmodel->loads_list[index]=savedloads;
                 femmodel->loads=savedloads;
         }