Changeset 709

Timestamp:

May 7, 2007 12:18:04 PM (17 years ago)

Author:

dkearney

Message:

added newton, amu as units.
clarified system names for hz, bq, mol

Location:

trunk/src/core

Files:

• RpUnits.cc (modified) (8 diffs)
• RpUnits.h (modified) (4 diffs)

trunk/src/core/RpUnits.cc

@@ -2383 +2383 @@
         retVal = RpUnitsPreset::addPresetPressure();
     }
+    else if (group.compare(RP_TYPE_CONC) == 0) {
+        retVal = RpUnitsPreset::addPresetConcentration();
+    }
+    else if (group.compare(RP_TYPE_FORCE) == 0) {
+        retVal = RpUnitsPreset::addPresetForce();
+    }
     else if (group.compare(RP_TYPE_MISC) == 0) {
         retVal = RpUnitsPreset::addPresetMisc();
@@ -2414 +2420 @@
     result += addPresetPressure();
     result += addPresetConcentration();
+    result += addPresetForce();
     result += addPresetMisc();
 
@@ -2473 +2480 @@
                               !RPUNITS_CASE_INSENSITIVE);
     micro = RpUnits::define ( "u",  basis, type);
-    nano  = RpUnits::define ( "n",  basis, type);
+    nano  = RpUnits::define ( "n",  basis, type, !RPUNITS_METRIC,
+                              !RPUNITS_CASE_INSENSITIVE);
     pico  = RpUnits::define ( "p",  basis, type, !RPUNITS_METRIC,
                               !RPUNITS_CASE_INSENSITIVE);
@@ -2823 +2831 @@
 /// Add concentration related units to the dictionary
 /**
- * http://www.ilpi.com/msds/ref/pressureunits.html
  *
  * Defines the following units:
@@ -2848 +2855 @@
 
 /**********************************************************************/
+// METHOD: addPresetForce()
+/// Add concentration related units to the dictionary
+/**
+ * http://en.wikipedia.org/wiki/Newton
+ *
+ * Defines the following units:
+ *   newton    (N)
+ *
+ * Return codes: 0 success, anything else is error
+ */
+
+int
+RpUnitsPreset::addPresetForce () {
+
+    RpUnits* newton = NULL;
+
+    newton = RpUnits::define("N",  NULL, RP_TYPE_FORCE, RPUNITS_METRIC);
+
+    return 0;
+}
+
+/**********************************************************************/
 // METHOD: addPresetMisc()
 /// Add Misc related units to the dictionary
@@ -2864 +2893 @@
     RpUnits* hertz     = NULL;
     RpUnits* becquerel = NULL;
+    RpUnits* amu       = NULL;
 
     volt      = RpUnits::define("V",  NULL, RP_TYPE_EPOT, RPUNITS_METRIC);
-    mole      = RpUnits::define("mol",NULL, RP_TYPE_MISC, RPUNITS_METRIC);
-    hertz     = RpUnits::define("Hz", NULL, RP_TYPE_MISC, RPUNITS_METRIC);
-    becquerel = RpUnits::define("Bq", NULL, RP_TYPE_MISC, RPUNITS_METRIC);
+    mole      = RpUnits::define("mol",NULL, "quantity", RPUNITS_METRIC);
+    hertz     = RpUnits::define("Hz", NULL, "frequency", RPUNITS_METRIC);
+    becquerel = RpUnits::define("Bq", NULL, "radioactivity", RPUNITS_METRIC);
+    amu       = RpUnits::define("amu", NULL, "mass_unit", !RPUNITS_METRIC);
 
     // RpUnits* percent   = RpUnits::define("%",  NULL, RP_TYPE_MISC);
@@ -2911 +2942 @@
         return &RpUnitsTypes::hintTypeConc;
     }
+    else if (type.compare(RP_TYPE_CONC) == 0) {
+        return &RpUnitsTypes::hintTypeForce;
+    }
     else if (type.compare(RP_TYPE_MISC) == 0) {
         return &RpUnitsTypes::hintTypeMisc;
@@ -3057 +3091 @@
 
     if ( (unitObj->getType()).compare(RP_TYPE_CONC) == 0 ) {
+        retVal = true;
+    }
+
+    return retVal;
+}
+
+bool
+RpUnitsTypes::hintTypeForce   (   RpUnits* unitObj    ) {
+
+    bool retVal = false;
+
+    if ( (unitObj->getType()).compare(RP_TYPE_FORCE) == 0 ) {
         retVal = true;
     }

trunk/src/core/RpUnits.h

@@ -45 +45 @@
 #define RP_TYPE_PRESSURE    "pressure"
 #define RP_TYPE_CONC        "concentration"
+#define RP_TYPE_FORCE       "force"
 #define RP_TYPE_MISC        "misc"
 
@@ -82 +83 @@
         static int  addPresetPressure();
         static int  addPresetConcentration();
+        static int  addPresetForce();
         static int  addPresetMisc();
 };
@@ -103 +105 @@
         static bool hintTypePressure  ( RpUnits* unitObj );
         static bool hintTypeConc      ( RpUnits* unitObj );
+        static bool hintTypeForce     ( RpUnits* unitObj );
         static bool hintTypeMisc      ( RpUnits* unitObj );
 
@@ -499 +502 @@
         // populate the dictionary with a set of units specified by group
         // if group equals........................then load................
-        //                   "all"           load all available units
-        //  RP_TYPE_ENERGY   "energy"        load units related to energy
-        //  RP_TYPE_EPOT     "electric_potential" load units related to electric potential
-        //  RP_TYPE_LENGTH   "length"        load units related to length
-        //  RP_TYPE_TEMP     "temperature"   load units related to temperature
-        //  RP_TYPE_TIME     "time"          load units related to time
-        //  RP_TYPE_VOLUME   "volume"        load units related to volume
-        //  RP_TYPE_ANGLE    "angle"         load units related to angles
-        //  RP_TYPE_MASS     "mass"          load units related to mass
-        //  RP_TYPE_PREFIX   "prefix"        load unit prefixes
-        //  RP_TYPE_PRESSURE "pressure"      load units related to pressure
-        //  RP_TYPE_CONC     "concentration" load units related to pressure
-        //  RP_TYPE_MISC     "misc"          load units related to everything else
+        //                    "all"           load all available units
+        //  RP_TYPE_ENERGY    "energy"        load units related to energy
+        //  RP_TYPE_EPOT      "electric_potential" load units related to electric potential
+        //  RP_TYPE_LENGTH    "length"        load units related to length
+        //  RP_TYPE_TEMP      "temperature"   load units related to temperature
+        //  RP_TYPE_TIME      "time"          load units related to time
+        //  RP_TYPE_VOLUME    "volume"        load units related to volume
+        //  RP_TYPE_ANGLE     "angle"         load units related to angles
+        //  RP_TYPE_MASS      "mass"          load units related to mass
+        //  RP_TYPE_PREFIX    "prefix"        load unit prefixes
+        //  RP_TYPE_PRESSURE  "pressure"      load units related to pressure
+        //  RP_TYPE_CONC      "concentration" load units related to concentration
+        //  RP_TYPE_FORCE     "force"         load units related to force
+        //  RP_TYPE_MISC      "misc"          load units related to everything else
         //  (no other groups have been created)