Changeset 4973

Timestamp:

08/04/10 12:00:48 (15 years ago)

Author:

Eric.Larour

Message:

Added MassFlux and Misfit conversion + simplified code.

File:

• issm/trunk/src/c/objects/ElementResults/NodalValuesUnitConversion.cpp (modified) (1 diff)

issm/trunk/src/c/objects/ElementResults/NodalValuesUnitConversion.cpp

@@ -20 +20 @@
         int i;
         double yts;
+        double scale;
 
         /*Get some values from parameters, that are often needed: */
         parameters->FindParam(&yts,YtsEnum);
 
+        /*Get scaling factor: */
         switch(enum_type){
-                case VxEnum:  for(i=0;i<num_nodal_values;i++)nodal_values[i]=nodal_values[i]*yts;break;
-                case VyEnum:  for(i=0;i<num_nodal_values;i++)nodal_values[i]=nodal_values[i]*yts;break;
-                case VzEnum:  for(i=0;i<num_nodal_values;i++)nodal_values[i]=nodal_values[i]*yts;break;
-                case VelEnum: for(i=0;i<num_nodal_values;i++)nodal_values[i]=nodal_values[i]*yts;break;
-                case MeltingRateEnum: for(i=0;i<num_nodal_values;i++)nodal_values[i]=nodal_values[i]*yts;break;
+                case VxEnum:  scale=yts;break; //m/yr
+                case VyEnum:  scale=yts;break; //m/yr
+                case VzEnum:  scale=yts;break; //m/yr
+                case VelEnum: scale=yts;break; //m/yr
+                case MeltingRateEnum: scale=yts;break; //m/yr
+                case MisfitEnum: scale=pow(yts,2);break; //(m/yr)^2
+                case MassFluxEnum: scale=pow(10,-12)*yts;break; // (GigaTon/year)
                 default: break;
         }
+                
+        /*Scale : */
+        for(i=0;i<num_nodal_values;i++)nodal_values[i]=nodal_values[i]*scale; 
 }