Changeset 2496

Timestamp:

10/22/09 15:53:48 (15 years ago)

Author:

Eric.Larour

Message:

Fixed nasty bug.

File:

• issm/trunk/src/c/ProcessParamsx/ProcessParamsx.cpp (modified) (2 diffs)

issm/trunk/src/c/ProcessParamsx/ProcessParamsx.cpp

@@ -28 +28 @@
         int i,j,k;
         int ndof;
+        int param_type;
 
         /*processing of parameters: */
@@ -41 +42 @@
         for(i=0;i<parameters->Size();i++){
 
-                Param* param=(Param*)parameters->GetObjectByOffset(i);
+                param_type=parameters->GetEnum(i);
 
-                if (param->GetType()==DOUBLEVEC){
+                if(param_type==ParamEnum()){
 
-                        ndof=param->GetNdof();
+                        Param* param=(Param*)parameters->GetObjectByOffset(i);
 
-                        if (ndof!=0){ /*ok, we are dealing with a parameter that needs to be repartitioned, for ndof degrees of freedom: */
+                        if (param->GetType()==DOUBLEVEC){
 
-                                new_parameter=(double*)xcalloc(numberofnodes*ndof,sizeof(double));
-                                param->GetParameterValue(&parameter);
+                                ndof=param->GetNdof();
 
-                                for(j=0;j<ndof;j++){
+                                if (ndof!=0){ /*ok, we are dealing with a parameter that needs to be repartitioned, for ndof degrees of freedom: */
 
-                                        for(k=0;k<numberofnodes;k++){
-                                        
-                                                new_parameter[(int)(ndof*partition[k]+j)]=parameter[ndof*k+j];
+                                        new_parameter=(double*)xcalloc(numberofnodes*ndof,sizeof(double));
+                                        param->GetParameterValue(&parameter);
+
+                                        for(j=0;j<ndof;j++){
+
+                                                for(k=0;k<numberofnodes;k++){
+                                                
+                                                        new_parameter[(int)(ndof*partition[k]+j)]=parameter[ndof*k+j];
+
+                                                }
 
                                         }
+                                
+                                        
+                                        /*Now, replace old parameter with new parameter: */
+                                        param->SetDoubleVec(new_parameter,ndof*numberofnodes,ndof);
+
+                                        /*Free ressources: */
+                                        xfree((void**)&new_parameter);
+                                        xfree((void**)&parameter);
 
                                 }
-                        
-                                
-                                /*Now, replace old parameter with new parameter: */
-                                param->SetDoubleVec(new_parameter,ndof*numberofnodes,ndof);
-
-                                /*Free ressources: */
-                                xfree((void**)&new_parameter);
-                                xfree((void**)&parameter);
-
                         }
                 }