Changeset 8809

Timestamp:

07/06/11 08:28:10 (14 years ago)

Author:

Mathieu Morlighem

Message:

Mergesolutionfromftogx requires configuration also

Location:

issm/trunk/src/c

Files:

• Container/Nodes.cpp (modified) (1 diff)
• Container/Nodes.h (modified) (1 diff)
• modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp (modified) (2 diffs)
• modules/VecMergex/VecMergex.cpp (modified) (3 diffs)

issm/trunk/src/c/Container/Nodes.cpp

@@ -203 +203 @@
 }
 /*}}}*/
-/*FUNCTION Nodes::FlagNodeSets{{{1*/
-void Nodes::FlagNodeSets(Vec pv_g, Vec pv_f, Vec pv_s,int analysis_type){
-
-        int i;
-
-        for(i=0;i<this->Size();i++){
-
-                Node* node=(Node*)this->GetObjectByOffset(i);
-                        
-                /*Check that this node corresponds to our analysis currently being carried out: */
-                if (node->InAnalysis(analysis_type)){
-
-                        /*Plug set values intp our 4 set vectors: */
-                        node->CreateVecSets(pv_g,pv_f,pv_s);
-                }
-        }
-
-        /*Assemble: */
-        VecAssemblyBegin(pv_g);
-        VecAssemblyEnd(pv_g);
-
-        VecAssemblyBegin(pv_f);
-        VecAssemblyEnd(pv_f);
-
-        VecAssemblyBegin(pv_s);
-        VecAssemblyEnd(pv_s);
-
-}
-/*}}}*/
 /*FUNCTION Nodes::MaxNumDofs{{{1*/
 int   Nodes::MaxNumDofs(int analysis_type,int setenum){

issm/trunk/src/c/Container/Nodes.h

@@ -22 +22 @@
                 void  DistributeDofs(int analysis_type,int SETENUM);
                 void  FlagClones(int analysis_type);
-                void  FlagNodeSets(Vec pv_g, Vec pv_f, Vec pv_s,int analysis_type);
                 int   MaxNumDofs(int analysis_type,int setenum);
                 int   NumberOfDofs(int analysis_type,int setenum);

issm/trunk/src/c/modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp

@@ -13 +13 @@
         /*intermediary: */
         int configuration_type;
-        int analysis_type;
         int gsize,fsize,ssize;
 
@@ -21 +20 @@
         /*first, get gsize, fsize and ssize: */
         parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
-        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
         gsize=nodes->NumberOfDofs(configuration_type,GsetEnum);
         fsize=nodes->NumberOfDofs(configuration_type,FsetEnum);

issm/trunk/src/c/modules/VecMergex/VecMergex.cpp

@@ -14 +14 @@
         /*variables: */
         int i;
-        int analysis_type, configuration_type;
+        int configuration_type;
         double* uf_serial=NULL;
 
         /*retrieve parameters: */
-        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
         parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
         
@@ -24 +23 @@
         VecToMPISerial(&uf_serial,uf);
 
-        /*Do we have any nodes for this analysis type? :*/
-        if(nodes->NumberOfNodes(analysis_type)){ 
+        /*Do we have any nodes for this configuration? :*/
+        if(nodes->NumberOfNodes(configuration_type)){ 
 
                 /*yes. Go through all nodes, and ask them to retrieve values from uf, and plug them into ug: */
@@ -32 +31 @@
                         Node* node=(Node*)nodes->GetObjectByOffset(i);
 
-                        /*Check that this node corresponds to our analysis currently being carried out: */
-                        if (node->InAnalysis(analysis_type)){
+                        /*Check that this node corresponds to our configuration currently being carried out: */
+                        if (node->InAnalysis(configuration_type)){
 
                                 /*For this object, merge values for enum set SetEnum: */