Changeset 13395 for issm/trunk/src/c/shared/Numerics/UnitConversion.cpp

Timestamp:

09/19/12 09:32:34 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13393

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/shared/Numerics/UnitConversion.cpp (modified) (3 diffs)

issm/trunk

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

issm/trunk/src/c/shared/Numerics/UnitConversion.cpp

@@ -11 +11 @@
 
 #include "../../Container/Container.h"
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../shared/shared.h"
@@ -29 +29 @@
         if(direction_enum==IuToExtEnum) for(i=0;i<numvalues;i++)values[i]=values[i]*scale; 
         else if(direction_enum==ExtToIuEnum) for(i=0;i<numvalues;i++)values[i]=values[i]/scale; 
-        else _error2_("wrong direction for unit conversion, either IuToExtEnum or ExtToIuEnum. ");
+        else _error_("wrong direction for unit conversion, either IuToExtEnum or ExtToIuEnum. ");
 
 }
@@ -51 +51 @@
                 case TimesteppingTimeStepEnum:               scale=1.0/yts;break; //yr
                 case TimeEnum:                               scale=1.0/yts;break; //yr
-                case HydrologyWaterVxEnum:                   scale=yts;break; //m/yr
-                case HydrologyWaterVyEnum:                   scale=yts;break; //m/yr
-                case VxEnum:                                 scale=yts;break; //m/yr
-                case InversionVxObsEnum:                     scale=yts;break; //m/yr
-                case VyEnum:                                 scale=yts;break; //m/yr
-                case InversionVyObsEnum:                     scale=yts;break; //m/yr
-                case VzEnum:                                 scale=yts;break; //m/yr
-                case InversionVzObsEnum:                     scale=yts;break; //m/yr
-                case VelEnum:                                scale=yts;break; //m/yr
-                case InversionVelObsEnum:                    scale=yts;break; //m/yr
-                case BalancethicknessThickeningRateEnum:     scale=yts;break; //m/yr
-                case BasalforcingsMeltingRateEnum:           scale=yts;break; //m/yr
-                case BasalforcingsMeltingRateCorrectionEnum: scale=yts;break; //m/yr
-                case SurfaceforcingsPrecipitationEnum:       scale=yts;break; //m/yr
-                case SurfaceforcingsMassBalanceEnum:         scale=yts;break; //m/yr
-                case SurfaceforcingsSmbPosMaxEnum:                              scale=yts;break; //m/yr
-                case SurfaceforcingsSmbPosMinEnum:                              scale=yts;break; //m/yr
-                case SurfaceforcingsAPosEnum:                                           scale=yts;break; //m/yr
-                case SurfaceforcingsBPosEnum:                                           scale=yts;break; //m/yr
-                case SurfaceforcingsANegEnum:                                           scale=yts;break; //m/yr
-                case SurfaceforcingsBNegEnum:                                           scale=yts;break; //m/yr
+                case HydrologyWaterVxEnum:                   scale=yts;break;     //m/yr
+                case HydrologyWaterVyEnum:                   scale=yts;break;     //m/yr
+                case VxEnum:                                 scale=yts;break;     //m/yr
+                case InversionVxObsEnum:                     scale=yts;break;     //m/yr
+                case VyEnum:                                 scale=yts;break;     //m/yr
+                case InversionVyObsEnum:                     scale=yts;break;     //m/yr
+                case VzEnum:                                 scale=yts;break;     //m/yr
+                case InversionVzObsEnum:                     scale=yts;break;     //m/yr
+                case VelEnum:                                scale=yts;break;     //m/yr
+                case InversionVelObsEnum:                    scale=yts;break;     //m/yr
+                case BalancethicknessThickeningRateEnum:     scale=yts;break;     //m/yr
+                case BasalforcingsMeltingRateEnum:           scale=yts;break;     //m/yr
+                case BasalforcingsMeltingRateCorrectionEnum: scale=yts;break;     //m/yr
+                case SurfaceforcingsPrecipitationEnum:       scale=yts;break;     //m/yr
+                case SurfaceforcingsMassBalanceEnum:         scale=yts;break;     //m/yr
+                case SurfaceforcingsSmbPosMaxEnum:                              scale=yts;break;     //m/yr
+                case SurfaceforcingsSmbPosMinEnum:                              scale=yts;break;     //m/yr
+                case SurfaceforcingsAPosEnum:                                           scale=yts;break;     //m/yr
+                case SurfaceforcingsBPosEnum:                                           scale=yts;break;     //m/yr
+                case SurfaceforcingsANegEnum:                                           scale=yts;break;     //m/yr
+                case SurfaceforcingsBNegEnum:                                           scale=yts;break;     //m/yr
                 case MisfitEnum:                             scale=pow(yts,2);break; //(m/yr)^2
                 case MassFluxEnum:                           scale=pow((IssmDouble)10,-12)*yts;break; // (GigaTon/year)
+                case TotalSmbEnum:                           scale=pow((IssmDouble)10,-12)*yts;break; // (GigaTon/year)
                 default: scale=1.0; break;
         }

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4