prerelease 2.2.0

MarekMatejak · Sep 8, 2014 · e260292 · e260292
1 parent 556fe85
commit e260292
Show file tree

Hide file tree

Showing 18 changed files with 5,359 additions and 5,264 deletions.
diff --git a/Physiolibrary/Chemical.mo b/Physiolibrary/Chemical.mo
diff --git a/Physiolibrary/Hydraulic.mo b/Physiolibrary/Hydraulic.mo
@@ -1111,7 +1111,7 @@ package Hydraulic "Domain with Pressure and Volumetric Flow"
               lineColor={0,0,0},
               smooth=Smooth.None,
               fillPattern=FillPattern.Solid,
-              fillColor={0,0,0}),Text(extent = {{-160,110},{40,50}}, lineColor = {0,0,0}, textString = "%name")}),
+              fillColor={0,0,0}),Text(extent=  {{-160,110},{40,50}}, lineColor=  {0,0,0}, textString=  "%name")}),
         Documentation(info="<html>
 <p>
 Connector with one flow signal of type Real.
@@ -1145,7 +1145,7 @@ Connector with one flow signal of type Real.
               lineColor={0,0,0},
               smooth=Smooth.None,
               fillPattern=FillPattern.Solid,
-              fillColor={200,200,200}),Text(extent = {{-160,110},{40,50}}, lineColor = {0,0,0}, textString = "%name")}));
+              fillColor={200,200,200}),Text(extent=  {{-160,110},{40,50}}, lineColor=  {0,0,0}, textString=  "%name")}));
     end HydraulicPort_b;
 
     partial model OnePort "Hydraulical OnePort"

diff --git a/Physiolibrary/Icons.mo b/Physiolibrary/Icons.mo
@@ -154,16 +154,14 @@ package Icons "Icons for physiological models"
 
     annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
               {100,100}}),        graphics={Bitmap(extent={{-96,100},{24,-100}},
-              fileName="modelica://Physiolibrary/Resources/Icons/srdceLeva.png")}), Diagram(
-          coordinateSystem(extent={{-100,-100},{100,100}})));
+              fileName="modelica://Physiolibrary/Resources/Icons/srdceLeva.png")}));
   end LeftHeart;
 
   model RightHeart
 
     annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
               {100,100}}),       graphics={Bitmap(extent={{-26,66},{92,-100}},
-              fileName="modelica://Physiolibrary/Resources/Icons/srdceprava.png")}), Diagram(
-          coordinateSystem(extent={{-100,-100},{100,100}})));
+              fileName="modelica://Physiolibrary/Resources/Icons/srdceprava.png")}));
   end RightHeart;
 
   model Liver

diff --git a/Physiolibrary/Osmotic.mo b/Physiolibrary/Osmotic.mo
@@ -145,11 +145,6 @@ package Osmotic "Domain with Osmorarity and Solvent Volumetric Flow"
       Hydraulic.Sensors.PressureMeasure pressureMeasure2
         annotation (Placement(transformation(extent={{62,-22},{42,-2}})));
     equation
-      connect(flowMeasure.actualFlow, choroid_plexus_hydraulic.solutionFlow)
-        annotation (Line(
-          points={{8,-2},{8,-18}},
-          color={0,0,127},
-          smooth=Smooth.None));
       connect(CSF_hydraulic.q_in, pressureMeasure.q_in) annotation (Line(
           points={{-86,-22},{-86,68},{-84,68}},
           color={0,0,0},
@@ -182,11 +177,6 @@ package Osmotic "Domain with Osmorarity and Solvent Volumetric Flow"
           color={0,0,0},
           thickness=1,
           smooth=Smooth.None));
-      connect(pressureMeasure.actualPressure, arachnoid_villi.hydraulicPressureIn)
-        annotation (Line(
-          points={{-74,70},{-34,70},{-34,64}},
-          color={0,0,127},
-          smooth=Smooth.None));
       connect(arachnoid_villi.q_out, flowMeasure1.q_in) annotation (Line(
           points={{-16,56},{-2,56}},
           color={127,127,0},
@@ -197,11 +187,6 @@ package Osmotic "Domain with Osmorarity and Solvent Volumetric Flow"
           color={127,127,0},
           thickness=1,
           smooth=Smooth.None));
-      connect(flowMeasure1.actualFlow, arachnoid_villi_hydraulic.solutionFlow)
-        annotation (Line(
-          points={{8,62},{8,82}},
-          color={0,0,127},
-          smooth=Smooth.None));
       connect(conductor.q_out, choroidPlexusCapilaries.q_in) annotation (Line(
           points={{96,-10},{96,-22},{66,-22}},
           color={0,0,0},
@@ -233,11 +218,6 @@ package Osmotic "Domain with Osmorarity and Solvent Volumetric Flow"
           color={0,0,0},
           thickness=1,
           smooth=Smooth.None));
-      connect(pressureMeasure1.actualPressure, arachnoid_villi.hydraulicPressureOut)
-        annotation (Line(
-          points={{52,70},{-18,70},{-18,64}},
-          color={0,0,127},
-          smooth=Smooth.None));
       connect(choroidPlexusCapilaries.q_in, pressureMeasure2.q_in) annotation (
           Line(
           points={{66,-22},{56,-22},{56,-18}},
@@ -254,14 +234,34 @@ package Osmotic "Domain with Osmorarity and Solvent Volumetric Flow"
           color={127,127,0},
           thickness=1,
           smooth=Smooth.None));
-      connect(pressureMeasure.actualPressure, choroid_plexus.hydraulicPressureOut)
+      connect(pressureMeasure2.pressure, choroid_plexus.hydraulicPressureIn)
+        annotation (Line(
+          points={{46,-16},{28,-16},{28,20},{-18,20},{-18,12}},
+          color={0,0,127},
+          smooth=Smooth.None));
+      connect(pressureMeasure1.pressure, arachnoid_villi.hydraulicPressureOut)
         annotation (Line(
-          points={{-74,70},{-42,70},{-42,20},{-34,20},{-34,12}},
+          points={{52,70},{-18,70},{-18,64}},
           color={0,0,127},
           smooth=Smooth.None));
-      connect(pressureMeasure2.actualPressure, choroid_plexus.hydraulicPressureIn)
+      connect(pressureMeasure.pressure, arachnoid_villi.hydraulicPressureIn)
         annotation (Line(
-          points={{46,-16},{28,-16},{28,20},{-18,20},{-18,12}},
+          points={{-74,70},{-34,70},{-34,64}},
+          color={0,0,127},
+          smooth=Smooth.None));
+      connect(pressureMeasure.pressure, choroid_plexus.hydraulicPressureOut)
+        annotation (Line(
+          points={{-74,70},{-52,70},{-52,28},{-34,28},{-34,12}},
+          color={0,0,127},
+          smooth=Smooth.None));
+      connect(flowMeasure1.volumeFlowRate, arachnoid_villi_hydraulic.solutionFlow)
+        annotation (Line(
+          points={{8,62},{8,82}},
+          color={0,0,127},
+          smooth=Smooth.None));
+      connect(flowMeasure.volumeFlowRate, choroid_plexus_hydraulic.solutionFlow)
+        annotation (Line(
+          points={{8,-2},{8,-18}},
           color={0,0,127},
           smooth=Smooth.None));
       annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,

diff --git a/...ertBioChem_1.0.1_to_Physiolibrary_2.1.mos → ...ertBioChem_1.0.1_to_Physiolibrary_2.2.mos b/...ertBioChem_1.0.1_to_Physiolibrary_2.1.mos → ...ertBioChem_1.0.1_to_Physiolibrary_2.2.mos
@@ -1,4 +1,4 @@
-// Convert from BioChem 1.0.1 to Physiolibrary 2.1
+// Convert from BioChem 1.0.1 to Physiolibrary 2.2
 
 // clear
 convertClear();
@@ -64,6 +64,7 @@ convertClass("BioChem.Substances.Substance","Physiolibrary.Chemical.Components.S
 convertElement("BioChem.Substances.Substance","n1","q_out")
 convertElement("BioChem.Substances.Substance","c.start","solute_start")
 convertModifiers("BioChem.Substances.Substance",{"c.start"},{"solute_start=%c.start%"}, true);
+convertElement("BioChem.Substances.Substance","solventVolume","solutionVolume");
 
 convertClass("BioChem.Reactions.MassAction.Irreversible.UniUni.Uui","Physiolibrary.Chemical.Components.ChemicalReaction")
 convertElement("BioChem.Reactions.MassAction.Irreversible.UniUni.Uui","k1","kf")

diff --git a/...nvertPhysiolibrary_from_0.4980_to_2.1.mos → ...nvertPhysiolibrary_from_0.4980_to_2.2.mos b/...nvertPhysiolibrary_from_0.4980_to_2.1.mos → ...nvertPhysiolibrary_from_0.4980_to_2.2.mos
@@ -1,4 +1,4 @@
-// Convert from Physiolibrary 0.4980 to Physiolibrary 2.1
+// Convert from Physiolibrary 0.4980 to Physiolibrary 2.2
 
 // clear
 convertClear();
@@ -8,13 +8,18 @@ convertClear();
 
 convertClass("Physiolibrary.Molar.Substance","Physiolibrary.Chemical.Components.Substance")
 convertModifiers("Physiolibrary.Molar.Substance", fill("",0)  , {"useNormalizedVolume=false"}, true);
+convertElement("Physiolibrary.Molar.Substance","solventVolume","solutionVolume");
 convertClass("Physiolibrary.Molar.NormalizedSubstance","Physiolibrary.Chemical.Components.Substance")
+convertElement("Physiolibrary.Molar.NormalizedSubstance","solventVolume","solutionVolume");
 convertClass("Physiolibrary.Molar.ChemicalReaction","Physiolibrary.Chemical.Components.ChemicalReaction")
+convertElement("Physiolibrary.Molar.ChemicalReaction","solventVolume","solutionVolume");
 convertClass("Physiolibrary.Molar.ChemicalReaction2","Physiolibrary.Chemical.Components.ChemicalReaction")
 convertModifiers("Physiolibrary.Molar.ChemicalReaction2", fill("",0)  , {"useHeatPort=true"}, true);
+convertElement("Physiolibrary.Molar.ChemicalReaction2","solventVolume","solutionVolume");
 convertClass("Physiolibrary.Molar.ChemicalReaction3","Physiolibrary.Chemical.Components.ChemicalReaction")
 convertModifiers("Physiolibrary.Molar.ChemicalReaction3", fill("",0)  , {"useHeatPort=true","useDissociationConstantInput=true"}, true);
 convertElement("Physiolibrary.Molar.ChemicalReaction3","K","dissociationConstant")
+convertElement("Physiolibrary.Molar.ChemicalReaction3","solventVolume","solutionVolume");
 convertClass("Physiolibrary.Molar.Diffusion","Physiolibrary.Chemical.Components.Diffusion")
 convertElement("Physiolibrary.Molar.Diffusion","cond","Conductance")
 convertModifiers("Physiolibrary.Molar.Diffusion",{"cond"}  , {"Conductance=%cond%*(1e-6)/60"}, true);
@@ -25,10 +30,14 @@ convertModifiers("Physiolibrary.Molar.GasSolubility2", fill("",0)  , {"useHeatPo
 convertModifiers("Physiolibrary.Molar.GasSolubility2",{"kH_T0"}  , {"kH_T0=1/%kH_T0%","useHeatPort=true"}, true);
 convertClass("Physiolibrary.Molar.Degradation","Physiolibrary.Chemical.Components.Degradation")
 convertModifiers("Physiolibrary.Molar.Degradation", fill("",0)  , {"useNormalizedVolume=false"}, true);
-convertElement("Physiolibrary.Molar.Degradation","volume","solventVolume")
+convertElement("Physiolibrary.Molar.Degradation","volume","solutionVolume");
 convertClass("Physiolibrary.Molar.Clearance","Physiolibrary.Chemical.Components.Clearance")
+convertElement("Physiolibrary.Molar.Clearance","useSolventFlow","useSolutionFlowInput");
+convertElement("Physiolibrary.Molar.Clearance","solventFlow","solutionFlow");
 convertClass("Physiolibrary.Molar.Clearance2","Physiolibrary.Chemical.Components.Clearance")
 convertModifiers("Physiolibrary.Molar.Clearance2", fill("",0)  , {"useSolventFlow=true"}, true);
+convertElement("Physiolibrary.Molar.Clearance2","useSolventFlow","useSolutionFlowInput");
+convertElement("Physiolibrary.molar.Clearance2","solventFlow","solutionFlow");
 convertClass("Physiolibrary.Molar.MolarStream","Physiolibrary.Chemical.Components.Stream")
 convertModifiers("Physiolibrary.Molar.MolarStream", fill("",0)  , {"useSolutionFlowInput=true"}, true);
 convertElement("Physiolibrary.Molar.MolarStream","solventFlow","solutionFlow")
@@ -49,10 +58,17 @@ convertClass("Physiolibrary.Molar.FullReabsorbtion","Physiolibrary.Chemical.Comp
 convertElement("Physiolibrary.Molar.FullReabsorbtion","MaxReab","MaxReabsorption")
 convertElement("Physiolibrary.Molar.FullReabsorbtion","Reabsorbtion","Reabsorption")
 
-convertClass("Physiolibrary.Molar.FlowConcentrationMeasure","Physiolibrary.Chemical.Sensors.FlowConcentrationMeasure")
+convertClass("Physiolibrary.Molar.FlowConcentrationMeasure","Physiolibrary.Chemical.Sensors.IncrementalFlowConcentrationMeasure")
 convertModifiers("Physiolibrary.Molar.FlowConcentrationMeasure", fill("",0) , {"useSolutionFlowInput=true","useAdditionalSoluteFlowInput=true"}, true);
+convertElement("Physiolibrary.Molar.FlowConcentrationMeasure","solventFlow","solutionFlow");
+convertElement("Physiolibrary.Molar.FlowConcentrationMeasure","SolventFlow","solutionFlow");
+convertElement("Physiolibrary.Molar.FlowConcentrationMeasure","Conc","concentration");
 convertClass("Physiolibrary.Molar.FlowMeasure","Physiolibrary.Chemical.Sensors.MolarFlowMeasure")
-
+convertElement("Physiolibrary.Molar.FlowMeasure","actualFlow","molarFlowRate");
+convertClass("Physiolibrary.Molar.ConcentrationMeasure","Physiolibrary.Chemical.Sensors.ConcentrationMeasure")
+convertModifiers("Physiolibrary.Molar.ConcentrationMeasure", {"unitsString"}, fill("",0), true);
+convertModifiers("Physiolibrary.Molar.ConcentrationMeasure", {"toAnotherUnitCoef"}, fill("",0), true);
+convertElement("Physiolibrary.Molar.ConcentrationMeasure","actualConc","concentration");
 
 convertClass("Physiolibrary.Molar.MolarInflux","Physiolibrary.Chemical.Sources.UnlimitedSolutePump")
 convertModifiers("Physiolibrary.Molar.MolarInflux", fill("",0) , {"useSoluteFlowInput=true"}, true);
@@ -75,10 +91,6 @@ convertElement("Physiolibrary.Molar.ConcentrationCompartment","initialSoluteMass
 convertModifiers("Physiolibrary.Molar.ConcentrationCompartment",{"initialSoluteMass"}  , {"solute_start=%initialSoluteMass%*1e-3"}, true);
 convertElement("Physiolibrary.Molar.ConcentrationCompartment","soluteMass","solute")
 
-convertClass("Physiolibrary.Molar.ConcentrationMeasure","Physiolibrary.Chemical.Sensors.ConcentrationMeasure")
-convertModifiers("Physiolibrary.Molar.ConcentrationMeasure", {"unitsString"}, fill("",0), true);
-convertModifiers("Physiolibrary.Molar.ConcentrationMeasure", {"toAnotherUnitCoef"}, fill("",0), true);
-
 // Hydraulic
 
 convertClass("Physiolibrary.Hydraulic.Resistor","Physiolibrary.Hydraulic.Components.Conductor")
@@ -115,7 +127,9 @@ convertElement("Physiolibrary.Hydraulic.Reabsorbtion2","Reabsorbtion","Reabsorpt
 convertElement("Physiolibrary.Hydraulic.Reabsorbtion2","reabsorbtion","reabsorption")
 
 convertClass("Physiolibrary.Hydraulic.FlowMeasure","Physiolibrary.Hydraulic.Sensors.FlowMeasure")
+convertElement("Physiolibrary.Hydraulic.FlowMeasure","actualFlow","volumeFlow");
 convertClass("Physiolibrary.Hydraulic.PressureMeasure","Physiolibrary.Hydraulic.Sensors.PressureMeasure")
+convertElement("Physiolibrary.Hydraulic.PressureMeasure","actualPressure","pressure");
 
 convertClass("Physiolibrary.Hydraulic.InputPump","Physiolibrary.Hydraulic.Sources.UnlimitedPump")
 convertModifiers("Physiolibrary.Hydraulic.InputPump", fill("",0)  , {"useSolutionFlowInput=true"}, true);
@@ -136,6 +150,7 @@ convertClass("Physiolibrary.Hydraulic.OnePort","Physiolibrary.Hydraulic.Interfac
 
 convertClass("Physiolibrary.Thermal.UnlimitedHeat","Physiolibrary.Thermal.Sources.UnlimitedHeat")
 convertElement("Physiolibrary.Thermal.UnlimitedHeat","Temperature","T")
+convertElement("Physiolibrary.Thermal.UnlimitedHeat","q_in","port");
 convertClass("Physiolibrary.Thermal.HeatInflux","Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow")
 convertElement("Physiolibrary.Thermal.HeatInflux","desiredFlow_","Q_flow")
 convertElement("Physiolibrary.Thermal.HeatInflux","q_out","port")
@@ -148,7 +163,8 @@ convertClass("Physiolibrary.Thermal.HeatStream","Physiolibrary.Thermal.Component
 convertModifiers("Physiolibrary.Thermal.HeatStream", fill("",0)  , {"useMassFlowInput=true"}, true);
 convertElement("Physiolibrary.Thermal.HeatStream","substanceFlow","massFlow")
 convertElement("Physiolibrary.Thermal.HeatStream","specificHeat_","SpecificHeat")
-convertClass("Physiolibrary.Thermal.HeatOutstream","Physiolibrary.Thermal.Components.HeatOutstream")
+
+convertClass("Physiolibrary.Thermal.HeatOutstream","Physiolibrary.Thermal.Sources.MassOutflow")
 convertModifiers("Physiolibrary.Thermal.HeatOutstream", fill("",0)  , {"useMassFlowInput=true"}, true);
 convertElement("Physiolibrary.Thermal.HeatOutstream","liquidOutflow_","massFlow")
 convertElement("Physiolibrary.Thermal.HeatOutstream","specificHeat_","SpecificHeat")
@@ -181,6 +197,7 @@ convertModifiers("Physiolibrary.Osmotic.SolventFlux", fill("",0)  , {"useSolutio
 convertElement("Physiolibrary.Osmotic.SolventFlux","desiredFlow","solutionFlow")
 
 convertClass("Physiolibrary.Osmotic.FlowMeasure","Physiolibrary.Osmotic.Sensors.FlowMeasure")
+convertElement("Physiolibrary.Osmotic.FlowMeasure","actualFlow","volumeFlowRate");
 
 convertClass("Physiolibrary.Osmotic.SolventInflux","Physiolibrary.Osmotic.Sources.SolventInflux")
 convertModifiers("Physiolibrary.Osmotic.SolventInflux", fill("",0)  , {"useSolutionFlowInput=true"}, true);