Changeset 3053

Timestamp:

02/19/10 12:00:17 (15 years ago)

Author:

Eric.Larour

Message:

Big bug fix in UpdateFromInputs. + some cosmetic change in Numpar

Location:

issm/trunk/src/c/objects

Files:

• Numpar.cpp (modified) (1 diff)
• ParameterInputs.cpp (modified) (1 diff)

issm/trunk/src/c/objects/Numpar.cpp

@@ -149 +149 @@
         if(!parameters->FindParam(&viscosity_overshoot,"viscosity_overshoot"))throw ErrorException(__FUNCT__," error message: could not update viscosity_overshoot field");
         if(!parameters->FindParam(&stokesreconditioning,"stokesreconditioning"))throw ErrorException(__FUNCT__," error message: could not update stokesreconditioning field");
-        xfree((void**)&control_type); parameters->FindParam(&control_type,"control_type");
+        xfree((void**)&control_type); 
+        parameters->FindParam(&control_type,"control_type");
         parameters->FindParam(&cm_noisedmp,"cm_noisedmp");
         parameters->FindParam(&cm_mindmp_value,"cm_mindmp_value");

issm/trunk/src/c/objects/ParameterInputs.cpp

@@ -364 +364 @@
 
                         /*increment i to skip the distributed values just collected: */
-                        i+=qmu_npart;
+                        i+=qmu_npart-1; //careful, the for loop will add 1.
 
                         /*Free allocations: */