Changeset 8816 for issm/trunk/src/c/modules/Reducevectorgtofx/Reducevectorgtofx.cpp

Timestamp:

07/06/11 11:58:06 (14 years ago)

Author:

Mathieu Morlighem

Message:

some final problems

File:

• issm/trunk/src/c/modules/Reducevectorgtofx/Reducevectorgtofx.cpp (modified) (5 diffs)

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

@@ -13 +13 @@
         /*variables: */
         int i;
-        int analysis_type;
         int configuration_type;
         int fsize;
@@ -20 +19 @@
         /*first figure out fsize: */
         parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
-        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
         fsize=nodes->NumberOfDofs(configuration_type,FsetEnum);
+        printf("%s\n",EnumToStringx(configuration_type));
 
         if(fsize==0){
@@ -30 +29 @@
                 uf=NewVec(fsize);
 
-                if(nodes->NumberOfNodes(analysis_type)){ 
+                if(nodes->NumberOfNodes(configuration_type)){ 
 
                         /*serialize ug, so nodes can index into it: */
@@ -41 +40 @@
 
                                 /*Check that this node corresponds to our analysis currently being carried out: */
-                                if (node->InAnalysis(analysis_type)){
+                                if (node->InAnalysis(configuration_type)){
 
                                         /*For this object, reduce values for enum set Fset: */
@@ -47 +46 @@
                                 }
                         }
-
                 }
+                /*Assemble vector: */
+                VecAssemblyBegin(uf);
+                VecAssemblyEnd(uf);
         }
-
-        /*Assemble vector: */
-        VecAssemblyBegin(uf);
-        VecAssemblyEnd(uf);
-
 
         /*Free ressources:*/