Changeset 1427

Timestamp:

Apr 29, 2009 10:02:27 AM (15 years ago)

Author:

dkearney

Message:

adding tesla, gauss, weber and maxwell magnetic field units.
noticed python bindings do not validate the to_units before converting,
o stuff like mM-3 is not converted to /mm3 when given back to the user.
this is a minor bug right now.

Location:

trunk

Files:

• lang/python/Rappture/PyRpUnits.cc (modified) (2 diffs)
• lang/tcl/tests/units.test (modified) (1 diff)
• src/core/RpUnits.cc (modified) (5 diffs)
• src/core/RpUnits.h (modified) (4 diffs)
• src/core/RpUnitsStd.cc (modified) (1 diff)
• src/core/RpUnitsStd.h (modified) (1 diff)

trunk/lang/python/Rappture/PyRpUnits.cc

@@ -423 +423 @@
 
     static char *kwlist[] = {
-        (char *)"fromVal", 
-        (char *)"to", 
-        (char *)"units", 
-        NULL
+        (char *)"fromVal",
+        (char *)"to",
+        (char *)"units",
+        NULL
     };
 
@@ -433 +433 @@
         if (!PyArg_ParseTupleAndKeywords(args, keywds, "ss|s", 
                     kwlist, &fromVal, &to, &units)) {
-            return NULL; 
+            return NULL;
         }
     }

trunk/lang/tcl/tests/units.test

@@ -884 +884 @@
 
 #--------------------------------------------------------------------
+# Magnetic Field Conversions
+#--------------------------------------------------------------------
+
+test convert_units-5.4.11.0 {Rappture::Units::convert, T->G} {
+    list [catch {Rappture::Units::convert 5T -to G} msg] $msg
+} {0 50000G}
+
+test convert_units-5.4.11.1 {Rappture::Units::convert, G->T} {
+    list [catch {Rappture::Units::convert 5G -to T} msg] $msg
+} {0 0.0005T}
+
+test convert_units-5.4.11.2 {Rappture::Units::convert, G->mT} {
+    list [catch {Rappture::Units::convert 50G -to mT} msg] $msg
+} {0 5mT}
+
+test convert_units-5.4.11.3 {Rappture::Units::convert, Mx->Wb} {
+    list [catch {Rappture::Units::convert 5Mx -to Wb} msg] $msg
+} {0 5e-08Wb}
+
+test convert_units-5.4.11.4 {Rappture::Units::convert, Wb->Mx} {
+    list [catch {Rappture::Units::convert 5e-8Wb -to Mx} msg] $msg
+} {0 5Mx}
+
+test convert_units-5.4.11.5 {Rappture::Units::convert, wB->mX} {
+    list [catch {Rappture::Units::convert 5e-8wB -to mX} msg] $msg
+} {0 5Mx}
+
+#--------------------------------------------------------------------
 # Rappture::Units::Search::for <units>
 #--------------------------------------------------------------------

trunk/src/core/RpUnits.cc

@@ -2389 +2389 @@
         retVal = RpUnitsPreset::addPresetForce();
     }
+    else if (group.compare(RP_TYPE_MAGNETIC) == 0) {
+        retVal = RpUnitsPreset::addPresetMagnetic();
+    }
     else if (group.compare(RP_TYPE_MISC) == 0) {
         retVal = RpUnitsPreset::addPresetMisc();
@@ -2421 +2424 @@
     result += addPresetConcentration();
     result += addPresetForce();
+    result += addPresetMagnetic();
     result += addPresetMisc();
 
@@ -2880 +2884 @@
 
 /**********************************************************************/
+// METHOD: addPresetMagnetic()
+/// Add concentration related units to the dictionary
+/**
+ *
+ * http://en.wikipedia.org/wiki/Tesla_(unit)
+ * http://en.wikipedia.org/wiki/Gauss_(unit)
+ * http://en.wikipedia.org/wiki/Maxwell_(unit)
+ * http://en.wikipedia.org/wiki/Weber_(unit)
+ *
+ * Defines the following units:
+ *   tesla    (T)
+ *   gauss    (G)
+ *   maxwell  (Mx)
+ *   weber    (Wb)
+ *
+ * Return codes: 0 success, anything else is error
+ */
+
+int
+RpUnitsPreset::addPresetMagnetic () {
+
+    RpUnits* tesla = NULL;
+    RpUnits* gauss = NULL;
+    RpUnits* maxwell = NULL;
+    RpUnits* weber = NULL;
+
+    tesla = RpUnits::define("T",  NULL, RP_TYPE_MAGNETIC, RPUNITS_METRIC);
+    gauss = RpUnits::define("G",  NULL, RP_TYPE_MAGNETIC);
+    maxwell = RpUnits::define("Mx",  NULL, RP_TYPE_MAGNETIC);
+    weber = RpUnits::define("Wb", NULL, RP_TYPE_MAGNETIC, RPUNITS_METRIC);
+
+    RpUnits::define(tesla,gauss,tesla2gauss,gauss2tesla);
+    RpUnits::define(maxwell,weber,maxwell2weber,weber2maxwell);
+
+    return 0;
+}
+
+/**********************************************************************/
 // METHOD: addPresetMisc()
 /// Add Misc related units to the dictionary
@@ -2947 +2989 @@
         return &RpUnitsTypes::hintTypeConc;
     }
-    else if (type.compare(RP_TYPE_CONC) == 0) {
+    else if (type.compare(RP_TYPE_FORCE) == 0) {
         return &RpUnitsTypes::hintTypeForce;
+    }
+    else if (type.compare(RP_TYPE_MAGNETIC) == 0) {
+        return &RpUnitsTypes::hintTypeMagnetic;
     }
     else if (type.compare(RP_TYPE_MISC) == 0) {
@@ -3108 +3153 @@
 
     if ( (unitObj->getType()).compare(RP_TYPE_FORCE) == 0 ) {
+        retVal = true;
+    }
+
+    return retVal;
+}
+
+bool
+RpUnitsTypes::hintTypeMagnetic   (   RpUnits* unitObj    ) {
+
+    bool retVal = false;
+
+    if ( (unitObj->getType()).compare(RP_TYPE_MAGNETIC) == 0 ) {
         retVal = true;
     }

trunk/src/core/RpUnits.h

@@ -46 +46 @@
 #define RP_TYPE_CONC        "concentration"
 #define RP_TYPE_FORCE       "force"
+#define RP_TYPE_MAGNETIC    "magnetic"
 #define RP_TYPE_MISC        "misc"
 
@@ -84 +85 @@
         static int  addPresetConcentration();
         static int  addPresetForce();
+        static int  addPresetMagnetic();
         static int  addPresetMisc();
 };
@@ -106 +108 @@
         static bool hintTypeConc      ( RpUnits* unitObj );
         static bool hintTypeForce     ( RpUnits* unitObj );
+        static bool hintTypeMagnetic  ( RpUnits* unitObj );
         static bool hintTypeMisc      ( RpUnits* unitObj );
 
@@ -515 +518 @@
         //  RP_TYPE_CONC      "concentration" load units related to concentration
         //  RP_TYPE_FORCE     "force"         load units related to force
+        //  RP_TYPE_MAGNETIC  "magnetic"      load units related to magnetics
         //  RP_TYPE_MISC      "misc"          load units related to everything else
         //  (no other groups have been created)

trunk/src/core/RpUnitsStd.cc

@@ -567 +567 @@
 }
 
+/****************************************
+ * MAGNETIC CONVERSIONS
+ * http://en.wikipedia.org/wiki/Tesla_(unit)
+ * http://en.wikipedia.org/wiki/Gauss_(unit)
+ * http://en.wikipedia.org/wiki/Maxwell_(unit)
+ * http://en.wikipedia.org/wiki/Weber_(unit)
+ ****************************************/
+
+double tesla2gauss (double tesla)
+{
+    return (tesla*1e4);
+}
+
+double gauss2tesla (double gauss)
+{
+    return (gauss*1e-4);
+}
+
+double maxwell2weber (double maxwell)
+{
+    return (maxwell*1e-8);
+}
+
+double weber2maxwell (double weber)
+{
+    return (weber*1e8);
+}
+

trunk/src/core/RpUnitsStd.h

@@ -146 +146 @@
 double pOH2pH (double pOH);
 
+
+
+double tesla2gauss (double tesla);
+double gauss2tesla (double gauss);
+double maxwell2weber (double maxwell);
+double weber2maxwell (double weber);
+
 #ifdef __cplusplus
 }