Added rho_smoothing tests and reenabled it in the coolpropsolver

git-svn-id: https://svn.modelica.org/projects/ExternalMediaLibrary/trunk@8046 7ce873d0-865f-4ce7-a662-4bb36ea78beb

Author: jorrit

Modelica/ExternalMedia 3.2.1/Test.mo

@@ -1065,6 +1065,48 @@ package Test "Test models for the different solvers"
         varProps.Xi = X_var;
       end incompressibleCoolPropMixture;
     end Incompressible;
+
+    model RhoSmoothing
+      extends Modelica.Icons.Example;
+    package fluid_std
+      extends ExternalMedia.Media.CoolPropMedium(
+        mediumName = "Pentane",
+        substanceNames = {"n-Pentane|rho_smoothing_xend=0.0"},
+        inputChoice=ExternalMedia.Common.InputChoice.ph);
+    end fluid_std;
+
+    package fluid_spl
+      extends ExternalMedia.Media.CoolPropMedium(
+        mediumName = "Pentane",
+        substanceNames = {"n-Pentane|rho_smoothing_xend=0.2"},
+        inputChoice=ExternalMedia.Common.InputChoice.ph);
+    end fluid_spl;
+
+    fluid_std.ThermodynamicState state_std "Properties of the two-phase fluid";
+    fluid_spl.ThermodynamicState state_spl "Properties of the two-phase fluid";
+
+    Modelica.SIunits.AbsolutePressure p;
+    Modelica.SIunits.SpecificEnthalpy h;
+
+    fluid_std.SaturationProperties sat_std;
+
+    Modelica.SIunits.SpecificEnthalpy h_start;
+    Modelica.SIunits.SpecificEnthalpy h_end;
+    Modelica.SIunits.SpecificEnthalpy h_delta;
+
+    Modelica.SIunits.Time t = 1;
+
+    equation
+      p = 10E5;
+      sat_std = fluid_std.setSat_p(p);
+      h_start = fluid_std.bubbleEnthalpy(sat_std);
+      h_end = h_start;
+      //h_end = fluid_std.dewEnthalpy(sat_std);
+      h_delta = 1e3;
+      h = (h_start - h_delta) + (h_end-h_start+2*h_delta)*time/t;
+      state_std = fluid_std.setState_ph(p,h);
+      state_spl = fluid_spl.setState_ph(p,h);
+    end RhoSmoothing;
   end CoolProp;
 
   package WrongMedium "Test cases with wrong medium models"

Projects/Sources/coolpropsolver.cpp

@@ -223,7 +223,7 @@ void CoolPropSolver::postStateChange(ExternalThermodynamicState *const propertie
 					properties->ddhp = state->drhodh_constp_smoothed(twophase_derivsmoothing_xend); // [1/kPa -- > 1/Pa]
 					properties->ddph = state->drhodp_consth_smoothed(twophase_derivsmoothing_xend); // [1/(kJ/kg) -- > 1/(J/kg)]
 				}
-				else if (state->TwoPhase && state->Q() >= 0 && state->Q() <= rho_smoothing_xend && twophase_derivsmoothing_xend > 0.0)
+				else if (state->TwoPhase && state->Q() >= 0 && state->Q() <= rho_smoothing_xend && rho_smoothing_xend > 0.0)
 				{
 					// Use the smoothed density between a quality of 0 and rho_smoothing_xend
 					double rho_spline;