Changeset 2341

Timestamp:

09/28/09 10:04:28 (15 years ago)

Author:

Eric.Larour

Message:

meanvel, epsvel, cm_noisedamping, etc ... whatever appears
in Numpar, should be in the general CreateParameters routine, otherwise we
run the risk of not finding it when UpdateFromInputs tries to update the
Numpar fields.

Location:

issm/trunk/src/c/ModelProcessorx

Files:

• Control/CreateParametersControl.cpp (modified) (2 diffs)
• CreateParameters.cpp (modified) (1 diff)

issm/trunk/src/c/ModelProcessorx/Control/CreateParametersControl.cpp

@@ -87 +87 @@
                 parameters->AddObject(param);
 
-                /*cm_noisedampening: */
-                count++;
-                param= new Param(count,"cm_noisedampening",DOUBLE);
-                param->SetDouble(iomodel->cm_noisedampening);
-                parameters->AddObject(param);
-
+                
                 /*mincontrolconstraint: */
                 count++;
@@ -105 +100 @@
                 parameters->AddObject(param);
                 
-                /*epsvel: */
-                count++;
-                param= new Param(count,"epsvel",DOUBLE);
-                param->SetDouble(iomodel->epsvel);
-                parameters->AddObject(param);
+                                
                 
-                /*meanvel: */
-                count++;
-                param= new Param(count,"meanvel",DOUBLE);
-                param->SetDouble(iomodel->meanvel);
-                parameters->AddObject(param);
-
                 /*Now, recover fit, optscal and maxiter as vectors: */
                 IoModelFetchData(&iomodel->fit,NULL,NULL,iomodel_handle,"fit");

issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp

@@ -204 +204 @@
         param= new Param(count,"viscosity_overshoot",DOUBLE);
         param->SetDouble(iomodel->viscosity_overshoot);
+        parameters->AddObject(param);
+
+        /*meanvel: */
+        count++;
+        param= new Param(count,"meanvel",DOUBLE);
+        param->SetDouble(iomodel->meanvel);
+        parameters->AddObject(param);
+
+        /*cm_noisedampening: */
+        count++;
+        param= new Param(count,"cm_noisedampening",DOUBLE);
+        param->SetDouble(iomodel->cm_noisedampening);
+        parameters->AddObject(param);
+
+        /*epsvel: */
+        count++;
+        param= new Param(count,"epsvel",DOUBLE);
+        param->SetDouble(iomodel->epsvel);
         parameters->AddObject(param);