Fixed setter errors with unit conversions

interfaces/matlab_experimental/Base/Kinetics.m

@@ -109,7 +109,7 @@
 
         reactionEquations % All reaction equations within the Kinetics object.
 
-        reactionPhaseIndex % The index of the phase where the reactions occur. 
+        reactionPhaseIndex % The index of the phase where the reactions occur.
     end
 
     methods
@@ -342,7 +342,7 @@ function delete(kin)
             for k = krange
 
                 for i = irange
-                    
+
                     if iscell(k)
                         kk = kin.kineticsSpeciesIndex(k{:});
                     else
@@ -363,7 +363,7 @@ function delete(kin)
                 n = nonzeros(temp);
             elseif nnz(temp) == 0
                 n = 0;
-            else 
+            else
                 n = temp;
             end
         end

interfaces/matlab_experimental/Base/ThermoPhase.m

@@ -34,7 +34,7 @@
         %     String. Can be 'mole'/'molar'/'Molar'/'Mole' or 'mass'/'Mass'.
         basis
 
-        phaseName % Name of the phase. 
+        phaseName % Name of the phase.
 
         electricPotential % Electric potential. Units: V.
 
@@ -176,8 +176,8 @@
 
         refPressure % Reference pressure for standard-state. Units: Pa.
 
-        % Generate a report describing the thermodynamic state of this phase. 
-        % To print the report to the terminal, simply call the phase object. 
+        % Generate a report describing the thermodynamic state of this phase.
+        % To print the report to the terminal, simply call the phase object.
         % The following two statements are equivalent ::
         %
         %     >> phase
@@ -997,7 +997,7 @@ function display(tp)
             aa = char(ones(1, buflen));
             ptr = libpointer('cstring', aa);
             [iok, bb] = calllib(ctLib, 'thermo_report', tp.tpID, buflen, ptr, 1);
-                                
+
             if iok < 0
                 error(ctGetErr);
             end
@@ -1030,11 +1030,7 @@ function display(tp)
         end
 
         function volume = get.V(tp)
-            if strcmp(tp.basis, 'molar')
-                volume = 1 / tp.molarDensity;
-            else
-                volume = 1 / tp.D;
-            end
+            volume = 1 / tp.D;
         end
 
         function moleFractions = get.X(tp)
@@ -1404,6 +1400,9 @@ function display(tp)
         function set.HP(tp, input)
             h = input{1};
             p = input{2};
+            if strcmp(tp.basis, 'molar')
+                h = h/tp.meanMolecularWeight;
+            end
             ctFunc('thermo_set_HP', tp.tpID, [h, p]);
         end
 
@@ -1442,6 +1441,10 @@ function display(tp)
         function set.SH(tp, input)
             s = input{1};
             h = input{2};
+            if strcmp(tp.basis, 'molar')
+                s = s/tp.meanMolecularWeight;
+                h = h/tp.meanMolecularWeight;
+            end
             ctFunc('thermo_set_SH', tp.tpID, [s, h]);
         end
 
@@ -1458,6 +1461,9 @@ function display(tp)
         function set.SP(tp, input)
             s = input{1};
             p = input{2};
+            if strcmp(tp.basis, 'molar')
+                s = s/tp.meanMolecularWeight;
+            end
             ctFunc('thermo_set_SP', tp.tpID, [s, p]);
         end
 
@@ -1474,6 +1480,9 @@ function display(tp)
         function set.ST(tp, input)
             s = input{1};
             t = input{2};
+            if strcmp(tp.basis, 'molar')
+                s = s/tp.meanMolecularWeight;
+            end
             ctFunc('thermo_set_ST', tp.tpID, [s, t]);
         end
 
@@ -1490,6 +1499,9 @@ function display(tp)
         function set.SV(tp, input)
             s = input{1};
             v = input{2};
+            if strcmp(tp.basis, 'molar')
+                s = s/tp.meanMolecularWeight;
+            end
             ctFunc('thermo_set_SV', tp.tpID, [s, v]);
         end
 
@@ -1500,7 +1512,7 @@ function display(tp)
 
         function set.SVY(tp, input)
             tp.Y = input{3};
-            tp.SP = input(1:2);
+            tp.SV = input(1:2);
         end
 
         function set.TD(tp, input)
@@ -1522,6 +1534,9 @@ function display(tp)
         function set.TH(tp, input)
             t = input{1};
             h = input{2};
+            if strcmp(tp.basis, 'molar')
+                h = h/tp.meanMolecularWeight;
+            end
             ctFunc('thermo_set_TH', tp.tpID, [t, h]);
         end
 
@@ -1576,6 +1591,9 @@ function display(tp)
         function set.UP(tp, input)
             u = input{1};
             p = input{2};
+            if strcmp(tp.basis, 'molar')
+                u = u/tp.meanMolecularWeight;
+            end
             ctFunc('thermo_set_UP', tp.tpID, [u, p]);
         end
 
@@ -1592,6 +1610,9 @@ function display(tp)
         function set.UV(tp, input)
             u = input{1};
             v = input{2};
+            if strcmp(tp.basis, 'molar')
+                u = u/tp.meanMolecularWeight;
+            end
             ctFunc('thermo_set_UV', tp.tpID, [u, v]);
         end
 
@@ -1608,6 +1629,9 @@ function display(tp)
         function set.VH(tp, input)
             v = input{1};
             h = input{2};
+            if strcmp(tp.basis, 'molar')
+                h = h/tp.meanMolecularWeight;
+            end
             ctFunc('thermo_set_VH', tp.tpID, [v, h]);
         end
 

test/matlab_experimental/ctTestKinetics.m

@@ -57,7 +57,7 @@ function testIsReversible(self)
             for i = 1:self.phase.nReactions
                 self.verifyTrue(self.phase.isReversible(i));
             end
-            
+
             diamond = Solution('diamond.yaml', 'diamond_100', 'none');
             self.verifyFalse(diamond.isReversible(20));
             clear diamond