Changeset 155 for trunk/matml/webselector/php/dbquery.php.inc

Timestamp:

02/18/2005 02:27:34 PM (7 years ago)

Author:

kstemen

Message:

Set page encoding to UTF8 (some of the data from the MatML files is in UTF8, not ANSI).

Changed heat capacity so it uses Kelvin, like Thermal Conductivity.

Categorization color key is fixed for IE.

The extra 1's in unit descriptions have been removed, e.g. W-1-1/1-1-m-K is now W/m-K.

The unit conversion code now converts between degrees Fahrenheit, degrees Celcius, and Kelvin by only multiplying or dividing if those units appear with negative powers. I think this means I am treating all degrees Fahrenheit with negative powers as Rankin.

Upon Laura's request, the page title has been switched back to MatDL: MatML and Material Grapher.

Files:

• trunk/matml/webselector/php/dbquery.php.inc (modified) (6 diffs)

trunk/matml/webselector/php/dbquery.php.inc

@@ -16 +16 @@
         $ret=explode("/",$this->name);
         if(!isset($ret[1]))
-            $ret[1]="";
+            $ret[1]='1';
         return $ret;
+    }
+    function name_mul($a,$b)
+    {
+        if($a=='1')
+            return $b;
+        else if($b=='1')
+            return $a;
+        return "$a-$b";
     }
     function div($other)
@@ -23 +31 @@
         $mine=$this->name_split();
         $eirs=$other->name_split();
-        if($mine[0]&&$eirs[1])
-            $mine[0].="-$eirs[1]";
-        else
-            $mine[0].=$eirs[1];
-        if($mine[1]&&$eirs[0])
-            $mine[1].="-$eirs[0]";
-        else
-            $mine[1].=$eirs[0];
-        if(!$mine[1])
+        $mine[0]=$this->name_mul($mine[0],$eirs[1]);
+        $mine[1]=$this->name_mul($mine[1],$eirs[0]);
+
+        if($mine[1]=='1')
             $name=$mine[0];
         else
@@ -46 +49 @@
         $mine=$this->name_split();
         $eirs=$other->name_split();
-        if($mine[0]&&$eirs[0])
-            $mine[0].="-$eirs[0]";
-        else
-            $mine[0].=$eirs[0];
-        if($mine[1]&&$eirs[1])
-            $mine[1].="-$eirs[1]";
-        else
-            $mine[1].=$eirs[1];
-        if(!$mine[1])
+        $mine[0]=$this->name_mul($mine[0],$eirs[0]);
+        $mine[1]=$this->name_mul($mine[1],$eirs[1]);
+
+        if($mine[1]=='1')
             $name=$mine[0];
         else
@@ -73 +71 @@
 
 
-      if( $power > 1){
-        if($mine[0])
-          {
-            $mine[0].="^$power";
-          }
-        if($mine[1])
-          {
-            $mine[1].="^$power";
-          }
-      }
-      elseif($power == 1){
-        //Do nothing
-      }
-      elseif( $power == 0){
-
-        if($mine[0])
-          {
-            $mine[0]="1";
-          }
-        if($mine[1])
-          {
-            $mine[1]="1";
-          }
-      }
-      elseif($power == -1){
-
-        if($mine[0]&&$mine[1])
-          {
+      if($power < 0){
             $temp   = $mine[0];
             $mine[0]= $mine[1];
             $mine[1]= $temp;
+            $namepower=-$power;
+      }
+      else
+            $namepower=$power;
+
+      if( $namepower > 1){
+        if($mine[0]!='1')
+          {
+            $mine[0].="^$namepower";
           }
-        elseif($mine[1]&&!$mine[0])
+        if($mine[1]!='1')
           {
-            $mine[0]=$mine[1];
-            $mine[1]="";
+            $mine[1].="^$namepower";
           }
-        elseif($mine[0]&&!$mine[1])
-          {
-            $mine[1]=$mine[0];
-            $mine[0]=1;
-          }
-
-      }
-      elseif($power < -1){      
-
-
-                if($mine[0]&&$mine[1])
-          {
-            $temp   = $mine[0];
-            $mine[0]= "$mine[1]^".abs($power);
-            $mine[1]= "$temp^".abs($power);
-          }
-        elseif($mine[1]&&!$mine[0])
-          {
-            $mine[0]="$mine[1]^".abs($power);
-            $mine[1]="";
-          }
-        elseif($mine[0]&&!$mine[1])
-          {
-            $mine[1]="$mine[0]^".abs($power);
-            $mine[0]=1;
-          }
-
-      }
-
-
-        if(!$mine[1])
+      }
+      elseif($namepower == 1){
+        //Do nothing
+      }
+      elseif( $namepower == 0){
+            $mine[0]="1";
+            $mine[1]="1";
+      }
+
+        if($mine[1]=='1')
             $name=$mine[0];
         else
@@ -384 +342 @@
     $property_data->avg_value*=pow(
         $BTUs_to_Joules->scale,$power);
+
+    //Convert all negative powers of degree F and degree C to Kelvin
+    $degreeF_to_Kelvin=$unit_infos['K']->div($unit_infos['°F']);
+    $degreeF_to_Kelvin->scale=5.0/9.0;
+    $degreeC_to_Kelvin=$unit_infos['K']->div($unit_infos['°C']);
+    $degreeC_to_Kelvin->scale=1;
+
+    $power=get_factor_power($property_data->unit->num_name,$unit_infos['°F']->num_name);
+    if($power>0)
+        $power=0;
+    $property_data->unit=$property_data->unit->mul($degreeF_to_Kelvin->pow($power));
+    $property_data->avg_value*=pow(
+        $degreeF_to_Kelvin->scale,$power);
+        
+    $power=get_factor_power($property_data->unit->num_name,$unit_infos['°C']->num_name);
+    if($power>0)
+        $power=0;
+    $property_data->unit=$property_data->unit->mul($degreeC_to_Kelvin->pow($power));
+    $property_data->avg_value*=pow(
+        $degreeC_to_Kelvin->scale,$power);
+    
+    //Now convert negative powers of Kelvin to degree C and degree F as needed
+    $power=get_factor_power($unit->num_name,$unit_infos['°F']->num_name);
+    if($power>0)
+        $power=0;
+    $property_data->unit=$property_data->unit->div($degreeF_to_Kelvin->pow($power));
+    $property_data->avg_value/=pow(
+        $degreeF_to_Kelvin->scale,$power);
+
+    $power=get_factor_power($unit->num_name,$unit_infos['°C']->num_name);
+    if($power>0)
+        $power=0;
+    $property_data->unit=$property_data->unit->div($degreeC_to_Kelvin->pow($power));
+    $property_data->avg_value/=pow(
+        $degreeC_to_Kelvin->scale,$power);
 
     if(!$unit->equals($property_data->unit))
@@ -608 +601 @@
                          "Youngs Modulus"       => $unit_infos["MPa"],
                          "Yield Strength"      => $unit_infos["MPa"],
-                         "Heat Capacity"      => $unit_infos["J"]->div($unit_infos["g"]->mul($unit_infos["°C"])),
+                         "Heat Capacity"      => $unit_infos["J"]->div($unit_infos["g"]->mul($unit_infos["K"])),
                          "Thermal Conductivity"      => $unit_infos["W"]->div($unit_infos["m"]->mul($unit_infos["K"])),
                          );