[cig-commits] r13426 - cs/spatialdata-0.1/trunk/libsrc/units

[brad at geodynamics.org]

Author: brad
Date: 2008-12-01 09:06:27 -0800 (Mon, 01 Dec 2008)
New Revision: 13426

Modified:
   cs/spatialdata-0.1/trunk/libsrc/units/Nondimensional.cc
   cs/spatialdata-0.1/trunk/libsrc/units/Nondimensional.icc
Log:
Moved function to inline.

Modified: cs/spatialdata-0.1/trunk/libsrc/units/Nondimensional.cc
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/units/Nondimensional.cc	2008-11-30 06:50:48 UTC (rev 13425)
+++ cs/spatialdata-0.1/trunk/libsrc/units/Nondimensional.cc	2008-12-01 17:06:27 UTC (rev 13426)
@@ -111,34 +111,5 @@
   _density = value;
 } // densityScale
 
-// ----------------------------------------------------------------------
-// Make values dimensionless.
-void
-spatialdata::units::Nondimensional::nondimensionalize(double* const values,
-						      const int nvalues,
-						      const double scale) const
-{ // nondimensionalize
-  assert( (0 < nvalues && 0 != values) ||
-	  (0 == nvalues && 0 == values) );
 
-  for (int i=0; i < nvalues; ++i)
-    values[i] /= scale;
-} // nondimensionalize
-
-// ----------------------------------------------------------------------
-// Make value dimensionless.
-void
-spatialdata::units::Nondimensional::dimensionalize(double* const values,
-						   const int nvalues,
-						   const double scale) const
-{ // dimensionalize
-  assert( (0 < nvalues && 0 != values) ||
-	  (0 == nvalues && 0 == values) );
-
-  for (int i=0; i < nvalues; ++i)
-    values[i] *= scale;
-} // dimensionalize
-
-
-
 // End of file 

Modified: cs/spatialdata-0.1/trunk/libsrc/units/Nondimensional.icc
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/units/Nondimensional.icc	2008-11-30 06:50:48 UTC (rev 13425)
+++ cs/spatialdata-0.1/trunk/libsrc/units/Nondimensional.icc	2008-12-01 17:06:27 UTC (rev 13426)
@@ -14,6 +14,8 @@
 #error "Nondimensional.icc must only be included from Nondimensional.hh"
 #endif
 
+#include <assert.h> // USES assert()
+
 // Get value to nondimensionalize length scale in meters (SI units).
 inline
 double
@@ -50,6 +52,20 @@
   return value / scale;
 }
 
+// Make values dimensionless.
+inline
+void
+spatialdata::units::Nondimensional::nondimensionalize(double* const values,
+						      const int nvalues,
+						      const double scale) const
+{ // nondimensionalize
+  assert( (0 < nvalues && 0 != values) ||
+	  (0 == nvalues && 0 == values) );
+
+  for (int i=0; i < nvalues; ++i)
+    values[i] /= scale;
+} // nondimensionalize
+
 // Make value dimensionless.
 inline
 double
@@ -58,5 +74,19 @@
   return value * scale;
 }
 
+// Make value dimensionless.
+inline
+void
+spatialdata::units::Nondimensional::dimensionalize(double* const values,
+						   const int nvalues,
+						   const double scale) const
+{ // dimensionalize
+  assert( (0 < nvalues && 0 != values) ||
+	  (0 == nvalues && 0 == values) );
 
+  for (int i=0; i < nvalues; ++i)
+    values[i] *= scale;
+} // dimensionalize
+
+
 // End of file