Changeset 1740

Timestamp:

May 25, 2010 12:40:03 PM (14 years ago)

Author:

dkearney

Message:

making kelvin and celcius metric units, adding unit tests for the change

Location:

trunk

Files:

• lang/tcl/tests/units.test (modified) (1 diff)
• src/core/RpUnits.cc (modified) (1 diff)

trunk/lang/tcl/tests/units.test

@@ -659 +659 @@
 } {0 538.47R}
 
+test convert_units-5.4.6.12 {Rappture::Units::convert, K->mK} {
+    list [catch {Rappture::Units::convert 299.15K -to mK} msg] $msg
+} {0 299150mK}
+
+test convert_units-5.4.6.13 {Rappture::Units::convert, K->mk} {
+    list [catch {Rappture::Units::convert 299.15K -to mk} msg] $msg
+} {0 299150mK}
+
+test convert_units-5.4.6.14 {Rappture::Units::convert, C->mC} {
+    list [catch {Rappture::Units::convert 100C -to mC} msg] $msg
+} {0 100000mC}
+
+test convert_units-5.4.6.15 {Rappture::Units::convert, C->mc} {
+    list [catch {Rappture::Units::convert 100C -to mc} msg] $msg
+} {0 100000mC}
+
+
 #--------------------------------------------------------------------
 # Energy Conversions

trunk/src/core/RpUnits.cc

@@ -2590 +2590 @@
 
     fahrenheit = RpUnits::define("F", NULL, RP_TYPE_TEMP);
-    celcius    = RpUnits::define("C", NULL, RP_TYPE_TEMP);
-    kelvin     = RpUnits::define("K", NULL, RP_TYPE_TEMP);
+    celcius    = RpUnits::define("C", NULL, RP_TYPE_TEMP, RPUNITS_METRIC);
+    kelvin     = RpUnits::define("K", NULL, RP_TYPE_TEMP,RPUNITS_METRIC);
     rankine    = RpUnits::define("R", NULL, RP_TYPE_TEMP);