Changeset 116 for trunk/test/src

Timestamp:

Oct 26, 2005 11:32:52 PM (17 years ago)

Author:

dkearney

Message:

1. rewrote RpUnits::define(...) and RpUnits::convert(...) fxns.
2. added functionality so you no longer need to call add_presets(...)
3. RpUnits can now handle conversions as follows 1cm2/Vs -> 1e-7m2/kVus
4. Cannot handle conversions dealing with Temperature very well because

Temperature conversions have offsets (+/- 32...). you can still do
F->C and Fs->Cs, but Fms->Cs provides unreliable results. (not to
mention that i'm still unsure how to do a conversion like this.

5. still need to add Fo (delta fahrenheit) and Co (delta celcius)

units and conversions. These should not be effected by the notorious
temperature

6. adjusted RpUnits_test.cc for testing. python.fortran and matlab

bindings have not been tested yet.

Location:

trunk/test/src

Files:

• RpUnitsF_test.f (modified) (1 diff)
• RpUnits_test.cc (modified) (6 diffs)

trunk/test/src/RpUnitsF_test.f

@@ -30 +30 @@
         print *,"72F = ",dblVal, " (no units)"
         print *,"retVal = ",retVal
-        
+
       end program units_test
 

trunk/test/src/RpUnits_test.cc

@@ -41 +41 @@
     //
     printf ("=============== TEST 1 ===============\n");
-    const RpUnits * meters = RpUnits::define("m", NULL);
-    // (meters) ? success() : fail();
-    // RpUnits * centimeter = RpUnits::define("cm", NULL);
-
-    RpUnits::makeMetric(meters);
-    RpUnits::define("V", NULL);
-    RpUnits::define("s", NULL);
-
 /*
     std::string srch_str = std::string("cm");
@@ -61 +53 @@
 
 */
-    
+
+/*
     const RpUnits* mobility = RpUnits::defineCmplx("cm2/Vs", NULL);
     std::cout << "mobility = :" << mobility->getUnitsName() <<":"<< std::endl;
@@ -74 +67 @@
         std::cout << "mobility2 dn exists" << std::endl;
     }
-
+*/
+
+    const RpUnits* meters = RpUnits::find("m");
     const RpUnits* cmeters = RpUnits::find("cm");
-    const RpUnits* angstrom = RpUnits::define("A", NULL);
-    RpUnits::define(angstrom, meters, angstrom2meter, meter2angstrom);
+    const RpUnits* angstrom = RpUnits::find("A");
 
     value = angstrom->convert(meters,1.0,&result);
     std::cout << "1 angstrom = " << value << " meters" << std::endl;
+    std::cout << "result = " << result << std::endl;
 
     result = 0;
@@ -87 +82 @@
 
 
-    const RpUnits* fahrenheit  = RpUnits::define("F", NULL);
-    const RpUnits* celcius  = RpUnits::define("C", NULL);
-    const RpUnits* kelvin  = RpUnits::define("K", NULL);
-    
-    RpUnits::define(fahrenheit, celcius, fahrenheit2centigrade, centigrade2fahrenheit);
-    RpUnits::define(celcius, kelvin, centigrade2kelvin, kelvin2centigrade);
-    
+    const RpUnits* fahrenheit  = RpUnits::find("F");
+    const RpUnits* celcius  = RpUnits::find("C");
+    const RpUnits* kelvin  = RpUnits::find("K");
+
     value = fahrenheit->convert(celcius,72,&result);
     std::cout << "72 degrees fahrenheit = " << value << " degrees celcius" << std::endl;
-    
+
     value = celcius->convert(fahrenheit,value,&result);
     std::cout << "22.222 degrees celcius = " << value << " degrees fahrenheit" << std::endl;
-    
+
     value = celcius->convert(kelvin,20,&result);
     std::cout << "20 degrees celcius = " << value << " kelvin" << std::endl;
@@ -264 +256 @@
 
 
-    const RpUnits* eV  = RpUnits::define("eV", NULL);
-    const RpUnits* joules  = RpUnits::define("J", NULL);
-
-    RpUnits::define(eV, joules, electronVolt2joule, joule2electronVolt);
+    const RpUnits* eV  = RpUnits::find("eV");
+    const RpUnits* joules  = RpUnits::find("J");
 
     value = joules->convert(eV,1,&result);
@@ -323 +313 @@
     delete testRpUnits;
     std::cout << "copyRpUnits = " << copyRpUnits.getUnitsName() << std::endl;
+
+
+    // test deleting a const object
+
+    const RpUnits* myobj = RpUnits::define("myunit",NULL);
+    delete myobj;
+
+    // test /cm2
+    // std::cout << "convert (3m3 -> cm3)     = " << RpUnits::convert("3m3","cm3",0) << std::endl;
+    // std::cout << "convert (3/m3 -> /cm3)   = " << RpUnits::convert("3/m3","/cm3",0) << std::endl;
+    // std::cout << "convert (300cm3 -> m3)   = " << RpUnits::convert("300cm3","m3",0) << std::endl;
+    // std::cout << "convert (300/cm3 -> /m3) = " << RpUnits::convert("300/cm3","/m3",0) << std::endl;
+
+    std::cout << "convert (3m3 -> cm3)     = " << RpUnits::convert("3m3","cm3",0) << std::endl;
+    std::cout << "convert (3/m3 -> /cm3)   = " << RpUnits::convert("3/m3","/cm3",0) << std::endl;
+    std::cout << "convert (300cm3 -> m3)   = " << RpUnits::convert("300cm3","m3",0) << std::endl;
+    std::cout << "convert (300/cm3 -> /m3) = " << RpUnits::convert("300/cm3","/m3",0) << std::endl;
+    std::cout << "convert (72F -> 22.22C) = " << RpUnits::convert("72F","C",0) << std::endl;
+    std::cout << "convert (5J -> 3.12075e+28neV) = " << RpUnits::convert("5J","neV",0) << std::endl;
+    std::cout << "convert (5J2 -> 1.9478e+56neV2) = " << RpUnits::convert("5J2","neV2",0) << std::endl;
+
+    // testing complex units
+    std::cout << "convert (1cm2/Vs -> 0.0001m2/Vs) = " << RpUnits::convert("1cm2/Vs","m2/Vs",0) << std::endl;
+    std::cout << "convert (1cm2/Vs -> 0.1m2/kVs) = " << RpUnits::convert("1cm2/Vs","m2/kVs",0) << std::endl;
+    std::cout << "convert (1cm2/Vs -> 1e-7m2/kVus) = " << RpUnits::convert("1cm2/Vs","m2/kVus",0) << std::endl;
+
     return 0;
+
 }