diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Physiomodel 1.0.0/UsersGuide.mo" "converted-libraries/.openmodelica/libraries/Physiomodel 1.0.0/UsersGuide.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Physiomodel 1.0.0/UsersGuide.mo"	2022-03-10 09:57:38.552144197 +0000
+++ "converted-libraries/.openmodelica/libraries/Physiomodel 1.0.0/UsersGuide.mo"	2022-03-10 09:59:14.848156393 +0000
@@ -1,4 +1,4 @@
-﻿within Physiomodel;
+within Physiomodel;
 package UsersGuide "User's Guide"
   extends Modelica.Icons.Information;
 
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Physiomodel 1.0.0/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/Physiomodel 1.0.0/openmodelica.metadata.json"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Physiomodel 1.0.0/openmodelica.metadata.json"	2022-03-10 09:57:38.572144199 +0000
+++ "converted-libraries/.openmodelica/libraries/Physiomodel 1.0.0/openmodelica.metadata.json"	2022-03-10 09:59:14.876156395 +0000
@@ -1 +1 @@
-{"path":"Physiomodel", "sha":"07b7343c11601601d1e1ef454077e1c84ee71300", "support":"support", "uses":{"Modelica":"3.2.1", "Physiolibrary":"2.3.1"}, "version":"1.0.0", "zipfile":"https://github.com/physiology/Physiomodel/archive/07b7343c11601601d1e1ef454077e1c84ee71300.zip"}
+{"path": "Physiomodel", "sha": "07b7343c11601601d1e1ef454077e1c84ee71300", "support": "support", "uses": {"Modelica": "4.0.0", "Physiolibrary": "2.3.1"}, "version": "1.0.0", "zipfile": "https://github.com/physiology/Physiomodel/archive/07b7343c11601601d1e1ef454077e1c84ee71300.zip", "extraInfo": "Conversion script /home/hudson/saved_omc/libraries/.openmodelica/libraries/Modelica 4.0.0+maint.om//Resources/Scripts/Conversion/ConvertModelica_from_3.2.3_to_4.0.0.mos was applied"}
\ No newline at end of file
diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Physiomodel 1.0.0/package.mo" "converted-libraries/.openmodelica/libraries/Physiomodel 1.0.0/package.mo"
--- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Physiomodel 1.0.0/package.mo"	2022-03-10 09:57:38.568144198 +0000
+++ "converted-libraries/.openmodelica/libraries/Physiomodel 1.0.0/package.mo"	2022-03-10 09:59:14.752156379 +0000
@@ -1,4 +1,4 @@
-﻿within ;
+within ;
 package Physiomodel "Mammalian physiology model"
   extends Physiolibrary.Icons.GolemLib;
 
@@ -709,8 +709,7 @@
           extends Physiolibrary.Icons.HeartVentricle;
           parameter Physiolibrary.Types.Volume initialVol = 90e-6
           "Initial blood volume in ventricle";
-        //  parameter Physiolibrary.Types.Volume initialESV = 50e-6;
-
+        //  parameter Physiolibrary.Types.Volume initialESV = 50e-6;
         parameter Physiolibrary.Types.Volume NormalEndDiastolicVolume = 70e-6
           "Typical value of blood volume in ventricle after filling"
             annotation (Dialog(group="Diastole"));
@@ -723,41 +722,38 @@
         parameter Physiolibrary.Types.Fraction n_Diastole(displayUnit="1") = 2
           "Exponent of P-V characteristic of EDV curve on filling pressure"
             annotation (Dialog(group="Diastole"));
-        //parameter Real Abasic_Diastole = 0.00051
-        //    "parametrization of end diastolic volume curve"
-        //    annotation (Dialog(group="Diastole"));
-
+        //parameter Real Abasic_Diastole = 0.00051
+          //    "parametrization of end diastolic volume curve"
+          //    annotation (Dialog(group="Diastole"));
         parameter Physiolibrary.Types.Pressure NormalSystolicPressure = 15998.684210526315789473684210526
           "Typical value of systolic pressure relative to pericardium pressure"
             annotation (Dialog(group="Systole"));
         parameter Physiolibrary.Types.Volume NormalEndSystolicVolume = (NormalSystolicPressure/(17.39*101325/760))^(n_Systole)
           "Typical value of blood volume in ventricle after ejection"
             annotation (Dialog(group="Systole"));
-        //parameter Real Abasic_Systole = 17.39
-        //    "parametrization of end systolic volume curve";
+        //parameter Real Abasic_Systole = 17.39
+          //    "parametrization of end systolic volume curve";
         parameter Physiolibrary.Types.Pressure additionalPressure_Systolic
           "Pressure difference between mean and systolic pressure"
-            annotation (Dialog(group="Systole"));     //= 24
+            annotation (Dialog(group="Systole"));               //= 24
         parameter Physiolibrary.Types.Fraction contractilityBasic
           "Relative contractility (1 if normal)"
-             annotation (Dialog(group="Systole"));       //= 1
+             annotation (Dialog(group="Systole"));                 //= 1
         parameter Physiolibrary.Types.Fraction n_Systole(displayUnit="1")=0.5
           "Exponent of P-V characteristic of ESV curve on systolic pressure"
             annotation (Dialog(group="Systole"));
 
         parameter Physiolibrary.Types.Frequency K
           "time adaptation coeficient of average ventricle blood volume";
-                                                      // = 1
-        parameter Physiolibrary.Types.HydraulicCompliance BasicCompliance; //(final quantity="Compliance", final displayUnit="ml/mmHg") = 1;
-
+                                                      // = 1
+        parameter Physiolibrary.Types.HydraulicCompliance BasicCompliance; 
+//(final quantity="Compliance", final displayUnit="ml/mmHg") = 1;
         parameter Physiolibrary.Types.Pressure NormalExternalPressure = -446
           "Typical value of pericardium cavity pressure (relative to environment ambient pressure)";
-                                                                                 //-446 Pa = -3.34522 mmHg
-
-        //parameter Physiolibrary.Types.HydraulicCompliance MaxContractionCompliance; //=1;
-        //parameter Physiolibrary.Types.HydraulicConductance Cond1;//=1;
-        //parameter Physiolibrary.Types.HydraulicConductance Cond2;//=1;
-
+                                                                                 //-446 Pa = -3.34522 mmHg
+          //parameter Physiolibrary.Types.HydraulicCompliance MaxContractionCompliance; //=1;
+          //parameter Physiolibrary.Types.HydraulicConductance Cond1;//=1;
+          //parameter Physiolibrary.Types.HydraulicConductance Cond2;//=1;
         Physiolibrary.Hydraulic.Interfaces.HydraulicPort_a q_in annotation (
             extent=[-10,-110; 10,-90], Placement(transformation(extent={{-90,70},
                   {-70,90}}),iconTransformation(extent={{10,70},{30,90}})));
@@ -819,11 +815,11 @@
         NormalEndSystolicVolume=5.122e-05,
         contractilityBasic=1,
         K=1) annotation (Placement(transformation(extent={{-6,-46},{-50,-2}})));
-      //    Abasic_Diastole=0.00026,
-      //    Abasic_Systole=3.53,
-      //    MaxContractionCompliance(displayUnit="ml/mmHg") = 1.5001231516913e-08,
-      //    Cond1=60000000,
-      //    Cond2=60000000,
+      //    Abasic_Diastole=0.00026,
+        //    Abasic_Systole=3.53,
+        //    MaxContractionCompliance(displayUnit="ml/mmHg") = 1.5001231516913e-08,
+        //    Cond1=60000000,
+        //    Cond2=60000000,
       Physiolibrary.Hydraulic.Components.ElasticVessel LeftAtrium(
         stateName="LeftAtrium.Vol",
         useExternalPressureInput=true,
@@ -849,10 +845,10 @@
         contractilityBasic=1,
         K=0.016666666666667)
         annotation (Placement(transformation(extent={{26,-46},{70,-2}})));
-       //   MaxContractionCompliance(displayUnit="ml/mmHg") = 3.0002463033826e-09,
-         // Abasic_Diastole=0.00051,
-      //    Cond1(displayUnit="ml/(mmHg.min)") = 0.0075006157584566,
-      //    Cond2(displayUnit="ml/(mmHg.min)") = 0.0075006157584566,
+       //   MaxContractionCompliance(displayUnit="ml/mmHg") = 3.0002463033826e-09,
+        // Abasic_Diastole=0.00051,
+        //    Cond1(displayUnit="ml/(mmHg.min)") = 0.0075006157584566,
+        //    Cond2(displayUnit="ml/(mmHg.min)") = 0.0075006157584566,
       Physiolibrary.Types.BusConnector busConnector
         "signals of organ bood flow resistence" annotation (Placement(
             transformation(extent={{-4,32},{16,52}}), iconTransformation(extent=
@@ -1241,8 +1237,7 @@
         NormalEndDiastolicVolume=NormalEndDiastolicVolume,
         NormalExternalPressure(displayUnit="Pa") = NormalExternalPressure)
         annotation (Placement(transformation(extent={{-76,-44},{-56,-24}})));
-      //    ,Abasic_Diastole=Abasic_Diastole
-
+      //    ,Abasic_Diastole=Abasic_Diastole
         Systole systole(
           n_Systole=n_Systole,
           additionalPressure_Systolic=additionalPressure_Systolic,
@@ -1250,8 +1245,7 @@
           NormalEndSystolicVolume=NormalEndSystolicVolume,
         NormalExternalPressure=NormalExternalPressure)
           annotation (Placement(transformation(extent={{52,-44},{72,-24}})));
-       //   Abasic_Systole=Abasic_Systole,
-
+       //   Abasic_Systole=Abasic_Systole,
         Modelica.Blocks.Math.Feedback StrokeVolume
           annotation (Placement(transformation(extent={{-10,-10},{10,10}},
               origin={-8,-6})));
@@ -1470,9 +1464,8 @@
 
       model Systole
 
-      //  Real iconPoint[20,2](each final displayUnit="mm");
-      //  Real iconActualPoint[2,2](each final displayUnit="mm");
-
+//  Real iconPoint[20,2](each final displayUnit="mm");
+        //  Real iconActualPoint[2,2](each final displayUnit="mm");
       Physiolibrary.Hydraulic.Interfaces.HydraulicPort_b outflow annotation (
           Placement(transformation(extent={{80,20},{120,60}}),
             iconTransformation(extent={{80,20},{120,60}})));
@@ -1482,12 +1475,12 @@
 
       parameter Physiolibrary.Types.Fraction n_Systole(displayUnit="1")
         "parametrization of end diastolic volume curve";
-      //parameter Real Abasic_Systole "parametrization of end systolic volume curve";
+      //parameter Real Abasic_Systole "parametrization of end systolic volume curve";
       parameter Physiolibrary.Types.Pressure NormalSystolicPressure
         "Typical value of mean arterial pressure (relative to environment ambient pressure)";
           parameter Physiolibrary.Types.Pressure NormalExternalPressure = -446
         "Typical value of pericardium cavity pressure (relative to environment ambient pressure)";
-                                                                               //-446 Pa = -3.34522 mmHg
+                                                                               //-446 Pa = -3.34522 mmHg
       parameter Physiolibrary.Types.Volume NormalEndSystolicVolume
         "= 2.64 ml for left ventricle, parametrization of end systolic volume curve";
       parameter Physiolibrary.Types.Pressure additionalPressure_Systolic
@@ -1506,8 +1499,8 @@
                 extent={{-110,-70},{-90,-50}})));
       equation
         outflow.q = 0;
-      //  P=outflow.pressure;
-      //  ESV = ((outflow.pressure+additionalPressure_Systolic-externalPressure)/(contractility*Abasic_Systole))^(1/n_Systole);
+//  P=outflow.pressure;
+//  ESV = ((outflow.pressure+additionalPressure_Systolic-externalPressure)/(contractility*Abasic_Systole))^(1/n_Systole);
         ESV = NormalEndSystolicVolume*((outflow.pressure+additionalPressure_Systolic-externalPressure)/(contractility*(NormalSystolicPressure+additionalPressure_Systolic-NormalExternalPressure)))^(1/n_Systole);
 
       // drawing icon
@@ -1562,15 +1555,14 @@
         "parametrization of end diastolic volume curve";
       parameter Physiolibrary.Types.Fraction n_Diastole(displayUnit="1")
         "parametrization of end systolic volume curve";
-      //parameter Real Abasic_Diastole "parametrization of end diastolic volume curve";
+      //parameter Real Abasic_Diastole "parametrization of end diastolic volume curve";
       parameter Physiolibrary.Types.Pressure NormalFillingPressure
         "Typicall value of mean arterial filling pressure (relative to environment ambient pressure)";
       parameter Physiolibrary.Types.Pressure NormalExternalPressure = -446
         "Typical value of pericardium cavity pressure (relative to environment ambient pressure)";
       parameter Physiolibrary.Types.Volume NormalEndDiastolicVolume
         "= (NormalDiastolicPressure/Abasic_Diastole)^n_Diastole";
-      //Abasic_Diastole "parametrization of end diastolic volume curve";
-
+      //Abasic_Diastole "parametrization of end diastolic volume curve";
         Physiolibrary.Types.RealIO.VolumeOutput
                                             EDV   annotation (Placement(transformation(extent={{-74,-74},
                   {-34,-34}}), iconTransformation(
@@ -1579,8 +1571,8 @@
 
       equation
         inflow.q = 0;
-      //  P = inflow.pressure;
-      //  EDV = ((inflow.pressure-externalPressure)/(stiffnes*Abasic_Diastole))^(1/n_Diastole);
+//  P = inflow.pressure;
+//  EDV = ((inflow.pressure-externalPressure)/(stiffnes*Abasic_Diastole))^(1/n_Diastole);
         EDV = NormalEndDiastolicVolume*((inflow.pressure-externalPressure)/(stiffnes*(NormalFillingPressure-NormalExternalPressure)))^(1/n_Diastole);
 
         //  Stiffness = stiffnes;
@@ -1668,22 +1660,19 @@
     der(Volume) = delta / Library.SecPerMin;
   end if;
 */
-                    q_in.q + q_out.q = delta;
-
-                  if Simulation == Physiolibrary.Types.SimulationType.SteadyState then //Physiolibrary.SimulationType.STEADY then
-                    q_in.q = BloodFlow;
-                  else
-                    q_in.q = if (delta<0) then BloodFlow else BloodFlow+delta;
-                  end if;
-
-                    //increase (delta>0) average ventricle volume means flow delta from q_in (veins)
-                    //decrease (delta<0) average ventricle volume means flow delta to q_to (atrys)
-
-                   // StressedVol  =  max( Volume - V0,  0.0);
-                   // Compliance  =  BasicCompliance / VentricleDiastole_Stiffness;
-                   // Pressure  =  ( StressedVol / Compliance)  + ExternalPressure;
-
-                    state = Volume;
+                    q_in.q + q_out.q = delta;
+  if Simulation == Physiolibrary.Types.SimulationType.SteadyState then
+//Physiolibrary.SimulationType.STEADY then
+          q_in.q = BloodFlow;
+        else
+          q_in.q = if delta < 0 then BloodFlow else BloodFlow + delta;
+        end if;
+//increase (delta>0) average ventricle volume means flow delta from q_in (veins)
+//decrease (delta<0) average ventricle volume means flow delta to q_to (atrys)
+// StressedVol  =  max( Volume - V0,  0.0);
+// Compliance  =  BasicCompliance / VentricleDiastole_Stiffness;
+// Pressure  =  ( StressedVol / Compliance)  + ExternalPressure;
+        state = Volume;
                     change = delta;
                     annotation (Documentation(info="<HTML>
 <p>
@@ -2023,18 +2012,17 @@
                 origin={100,48})));
         equation
           inflow.q = 0;
-          P = inflow.pressure;
-          //linearna zavislost na HR - vid. mathematica/Efect_EDVonHR.nb
-          HR_effect = -0.00247654 * HR + 1.18574; //  1 = a*75+b;
-
-          EDV_withoutHReffect = (((inflow.pressure-externalPressure)/(stiffnes*Abasic_Diastole))^(1/n_Diastole));
+          P = inflow.pressure;
+//linearna zavislost na HR - vid. mathematica/Efect_EDVonHR.nb
+          HR_effect = (-0.00247654 * HR) + 1.18574;
+//  1 = a*75+b;
+          EDV_withoutHReffect = ((inflow.pressure - externalPressure) / (stiffnes * Abasic_Diastole)) ^ (1 / n_Diastole);
           EDV = HR_effect * (EDV_withoutHReffect-preESV) + preESV;
-          Stiffness = stiffnes;
-
-        // drawing icon
-          for i in 1:size(iconPoint,1) loop
-            iconPoint[i,1]=((i-1)/(size(iconPoint,1)))*180 - 90;
-            (iconPoint[i,1]+90)*200/180 = ( ( ( (iconPoint[i,2]+40)*200/130)-externalPressure)/(stiffnes*Abasic_Diastole))^(1/n_Diastole);
+          Stiffness = stiffnes;
+// drawing icon
+          for i in 1:size(iconPoint, 1) loop
+            iconPoint[i, 1] = (i - 1) / size(iconPoint, 1) * 180 - 90;
+            (iconPoint[i, 1] + 90) * 200 / 180 = (((iconPoint[i, 2] + 40) * 200 / 130 - externalPressure) / (stiffnes * Abasic_Diastole)) ^ (1 / n_Diastole);
           end for;
           iconActualPoint[1,1]=EDV*180/200-90 -2;
           iconActualPoint[1,2]=inflow.pressure*130/200-40 -2;
@@ -2086,10 +2074,10 @@
             ISOVOLUMIC_RELAXATION,
             FILLING);
           VentriclePhase state(start=VentriclePhase.ISOVOLUMIC_CONTRACTION);
-        //  Real Power;
+        //  Real Power;
           Real P(start=80,fixed=true);
           Real V(start=126,fixed=true);
-          Boolean b(start=false); //b[VentriclePhase](start={false,false,false,false});
+          Boolean b(start=false);           //b[VentriclePhase](start={false,false,false,false});
           Boolean c;
         /*  Library.PressureFlow.PositivePressureFlow q_in annotation (Placement(transformation(
           extent={{-106,-30},{-86,-10}}), iconTransformation(extent={{-27,58},{-7,
@@ -2103,7 +2091,7 @@
                 extent={{-20,-20},{20,20}},
                 rotation=270,
                 origin={-10,80}), iconTransformation(extent={{-100,50},{-80,70}})));
-          //Library.Interfaces.RealInput
+          //Library.Interfaces.RealInput
           Modelica.Blocks.Interfaces.RealOutput
                                               HeartMusclePower
                            annotation (Placement(transformation(
@@ -2135,32 +2123,38 @@
             state=mod(pre(state)+1,4);
           end when;
 
-          Power=der(P)*V + der(V)*P;  //=der(V*P)
-
-        //  der(V)= q_out.q + q_in.q;
-        state = V;
-          changePerMin = q_out.q + q_in.q;
-
-          if state==VentriclePhase.ISOVOLUMIC_CONTRACTION then
-            Power=HeartMusclePower;
-            q_in.q=0;
-            q_out.q=0;
-            b = P>=q_out.pressure; //reach true when ventricle outflow valve open
-          elseif state==VentriclePhase.EJECTION then
-            Power=HeartMusclePower;//-NextCirculationPower;
-            q_in.q=0;
-            P=q_out.pressure;
-            b = q_out.q>=0; //reach true when ventricle outflow valve close
-          elseif state==VentriclePhase.ISOVOLUMIC_RELAXATION then
-            Power=HeartMusclePower;
-            q_in.q=0;
-            q_out.q=0;
-            b = P<=q_in.pressure; //reach true when atrium-ventricle valve open
-          else //filling
-            Power=HeartMusclePower; //-PrevCirculationPower;
-            P=q_in.pressure;
-            q_out.q=0;
-            b = q_in.q<=0; //reach true when atrium-ventricle valve close
+          Power=der(P)*V + der(V)*P;
+//=der(V*P)
+//  der(V)= q_out.q + q_in.q;
+          state = V;
+          changePerMin = q_out.q + q_in.q;
+  if state == VentriclePhase.ISOVOLUMIC_CONTRACTION then
+            Power = HeartMusclePower;
+            q_in.q = 0;
+            q_out.q = 0;
+            b = P >= q_out.pressure;
+//reach true when ventricle outflow valve open
+          elseif state == VentriclePhase.EJECTION then
+            Power = HeartMusclePower;
+//-NextCirculationPower;
+            q_in.q = 0;
+            P = q_out.pressure;
+            b = q_out.q >= 0;
+//reach true when ventricle outflow valve close
+          elseif state == VentriclePhase.ISOVOLUMIC_RELAXATION then
+            Power = HeartMusclePower;
+            q_in.q = 0;
+            q_out.q = 0;
+            b = P <= q_in.pressure;
+//reach true when atrium-ventricle valve open
+          else
+//filling
+            Power = HeartMusclePower;
+//-PrevCirculationPower;
+            P = q_in.pressure;
+            q_out.q = 0;
+            b = q_in.q <= 0;
+//reach true when atrium-ventricle valve close
           end if;
 
           CO=-q_out.q;
@@ -2220,7 +2214,7 @@
         equation
           inflow.q = 0;
           P = inflow.pressure;
-          //linearna zavislost na HR - vid. mathematica/Efect_EDVonHR.nb
+//linearna zavislost na HR - vid. mathematica/Efect_EDVonHR.nb
           HR_effect = a*HR+b;
           1 = a*75+b;
           0.52 = a*200+b;
@@ -2813,8 +2807,7 @@
           Modelica.Blocks.Interfaces.RealOutput Pressure(  final quantity="Pressure", final displayUnit="mmHg")
           "blod pressure in compartment"
             annotation (Placement(transformation(extent={{30,-110},{50,-90}}, rotation=-90)));
-         // Real Vol "blood volume in compartment";
-
+         // Real Vol "blood volume in compartment";
           parameter Real initialVol = 0;
           Modelica.Blocks.Interfaces.RealOutput Vol(start=initialVol, final
               quantity =                                                             "Volume", final displayUnit=
@@ -2861,8 +2854,7 @@
 
          extends Physiolibrary.Icons.PulmonaryCirculation;
 
-        //Can not be one port, because for example whole periferal resistance is taken as ResistorBases, but blood can accumulate inside
-
+//Can not be one port, because for example whole periferal resistance is taken as ResistorBases, but blood can accumulate inside
       Physiolibrary.Hydraulic.Interfaces.HydraulicPort_a q_in "Blood inflow"
         annotation (extent=[-10,-110; 10,-90], Placement(transformation(extent=
                 {{-112,-10},{-92,10}}), iconTransformation(extent={{-112,-10},{
@@ -4113,8 +4105,8 @@
           annotation (Placement(transformation(extent={{-120,40},{-80,80}})));
 
         parameter Physiolibrary.Types.Fraction BasicRLShuntFraction(displayUnit="%") =  0.02
-        "basic percentage of total blood flow not exposed to lung air";                                                            //
-      //  parameter Real BasicRLShunt(final displayUnit="ml/min") =  110; // 220.0;
+        "basic percentage of total blood flow not exposed to lung air";                                                                  //
+        //  parameter Real BasicRLShunt(final displayUnit="ml/min") =  110; // 220.0;
         parameter Physiolibrary.Types.Pressure RightHemithorax_Pressure( displayUnit="mmHg") =   -533.28954966;
         parameter Physiolibrary.Types.Pressure LeftHemithorax_Pressure( displayUnit="mmHg") =   -533.28954966;
 
@@ -4136,15 +4128,14 @@
         Physiolibrary.Types.VolumeFlowRate Alveolar(displayUnit="ml/min")
         "blood flow exposed to lung air without dammage effect";
 
-      //  Real RightLungTotal(final displayUnit="ml/min") "right lung blood flow exposed to lung air without dammage effect";
-      //  Real RightLungVentilated(final displayUnit="ml/min") "right lung blood flow exposed to lung air";
-      //  Real RightLungShunt(final displayUnit="ml/min");
-      //  Real LeftLungTotal(final displayUnit="ml/min");
-      //  Real LeftLungVentilated(final displayUnit="ml/min");
-      //  Real LeftLungShunt(final displayUnit="ml/min");
-      //  Real AlveolarShunt(final displayUnit="ml/min");
-      //  Real TotalShunt(final displayUnit="ml/min");
-
+//  Real RightLungTotal(final displayUnit="ml/min") "right lung blood flow exposed to lung air without dammage effect";
+        //  Real RightLungVentilated(final displayUnit="ml/min") "right lung blood flow exposed to lung air";
+        //  Real RightLungShunt(final displayUnit="ml/min");
+        //  Real LeftLungTotal(final displayUnit="ml/min");
+        //  Real LeftLungVentilated(final displayUnit="ml/min");
+        //  Real LeftLungShunt(final displayUnit="ml/min");
+        //  Real AlveolarShunt(final displayUnit="ml/min");
+        //  Real TotalShunt(final displayUnit="ml/min");
         parameter Real[:,3] PressureOnInflation =   {{ -4.0,  1.0,  0}, {  4.0,  0.0,  0}};
         parameter Real[:,3] PressureGradientOnFlowDist =   {{ -25,  0.0,  0}, {   0,  0.5,  0.03}, {  25,  1.0,  0}};
 
@@ -4171,32 +4162,31 @@
           Xscale=101325/760)
         annotation (Placement(transformation(extent={{-2,-24},{18,-4}})));
       equation
-             PressureGradientRightLeft  =  RightHemithorax_Pressure - LeftHemithorax_Pressure;
-
-      //division between left and rigth lung blood flow by hemithorax pressure
-             Thorax_PressureGradientOnFlowDist.u = PressureGradientRightLeft;
+             PressureGradientRightLeft  =  RightHemithorax_Pressure - LeftHemithorax_Pressure;
+//division between left and rigth lung blood flow by hemithorax pressure
+        Thorax_PressureGradientOnFlowDist.u = PressureGradientRightLeft;
              Thorax_LeftLungFlowFract  =  Thorax_PressureGradientOnFlowDist.val;
-             Thorax_RightLungFlowFract  =  1.0 - Thorax_LeftLungFlowFract;
-
-      //damage effect of hemithorax pressure
-             Thorax_PressureOnInflationR.u = RightHemithorax_Pressure;
+             Thorax_RightLungFlowFract  =  1.0 - Thorax_LeftLungFlowFract;
+//damage effect of hemithorax pressure
+        Thorax_PressureOnInflationR.u = RightHemithorax_Pressure;
              RightHemithorax_LungInflation = Thorax_PressureOnInflationR.val;
              Thorax_PressureOnInflationL.u = LeftHemithorax_Pressure;
              LeftHemithorax_LungInflation = Thorax_PressureOnInflationL.val;
 
              Total  =  CardiacOutput;
-             RightLeftShunt  = BasicRLShuntFraction*Total; //min(BasicRLShunt,Total);
-             Alveolar  =  Total - RightLeftShunt;
-      //       RightLungTotal  =  Alveolar * Thorax_RightLungFlowFract;
-      //       RightLungVentilated  =  RightLungTotal * RightHemithorax_LungInflation;
-      //       RightLungShunt  =  RightLungTotal - RightLungVentilated;
-      //       LeftLungTotal  =  Alveolar * Thorax_LeftLungFlowFract;
-      //       LeftLungVentilated  =  LeftLungTotal * LeftHemithorax_LungInflation;
-      //       LeftLungShunt  =  LeftLungTotal - LeftLungVentilated;
-      //       AlveolarVentilated  =  RightLungVentilated + LeftLungVentilated;
-      //       AlveolarShunt  =  RightLungShunt + LeftLungShunt;
-      //       TotalShunt  =  RightLeftShunt + AlveolarShunt;
-             AlveolarVentilated  = Alveolar * ( Thorax_RightLungFlowFract * RightHemithorax_LungInflation + Thorax_LeftLungFlowFract * LeftHemithorax_LungInflation);
+             RightLeftShunt  = BasicRLShuntFraction*Total;
+//min(BasicRLShunt,Total);
+        Alveolar = Total - RightLeftShunt;
+//       RightLungTotal  =  Alveolar * Thorax_RightLungFlowFract;
+//       RightLungVentilated  =  RightLungTotal * RightHemithorax_LungInflation;
+//       RightLungShunt  =  RightLungTotal - RightLungVentilated;
+//       LeftLungTotal  =  Alveolar * Thorax_LeftLungFlowFract;
+//       LeftLungVentilated  =  LeftLungTotal * LeftHemithorax_LungInflation;
+//       LeftLungShunt  =  LeftLungTotal - LeftLungVentilated;
+//       AlveolarVentilated  =  RightLungVentilated + LeftLungVentilated;
+//       AlveolarShunt  =  RightLungShunt + LeftLungShunt;
+//       TotalShunt  =  RightLeftShunt + AlveolarShunt;
+        AlveolarVentilated = Alveolar * (Thorax_RightLungFlowFract * RightHemithorax_LungInflation + Thorax_LeftLungFlowFract * LeftHemithorax_LungInflation);
         annotation ( Documentation(revisions="<html>
 
 <table>
@@ -4285,8 +4275,8 @@
               rotation=90,
               origin={-68,100})));
 
-        parameter Physiolibrary.Types.Volume initialSystemisVeinsVol = 2329.57e-6; // = 2200;// = 2980;
-
+        parameter Physiolibrary.Types.Volume initialSystemisVeinsVol = 2329.57e-6; 
+// = 2200;// = 2980;
         Physiolibrary.Hydraulic.Sensors.PressureMeasure pressureMeasure
           annotation (Placement(transformation(extent={{16,-20},{36,0}})));
       equation
@@ -4536,7 +4526,7 @@
       end CollapsingVeins;
 
       model SystemicVeins
-        //extends QHP.Blood.OrganFlow.BaseBadDirection;
+        //extends QHP.Blood.OrganFlow.BaseBadDirection;
       extends Physiolibrary.Icons.Resistor;
 
       Physiolibrary.Hydraulic.Interfaces.HydraulicPort_a q_in "Blood inflow"
@@ -6186,8 +6176,8 @@
                 rotation=90,
                 origin={-68,100})));
 
-          parameter Real initialSystemisVeinsVol(final quantity="Volume", final unit =   "ml")= 2329.57; // = 2200;// = 2980;
-
+          parameter Real initialSystemisVeinsVol(final quantity="Volume", final unit =   "ml")= 2329.57; 
+// = 2200;// = 2980;
           Modelica.Blocks.Interfaces.RealOutput NormalizedVolume(final quantity=
                 "NormalizedVolume", final displayUnit="1")
           "maximal zero pressure blood volume in compartment"
@@ -6313,9 +6303,9 @@
                 origin={-40,-100}), iconTransformation(
                 extent={{-10,-10},{10,10}},
                 origin={100,60})));
-        //initial equation
-        //  Vol = initialVol;
-         // der(Vol) = 0;
+        //initial equation
+          //  Vol = initialVol;
+          // der(Vol) = 0;
         equation
 
           StressedVolume = max(Vol-V0,0);
@@ -8051,7 +8041,7 @@
                 {{-110,-10},{-90,10}}), iconTransformation(extent={{-110,-10},{
                 -90,10}})));
 
-      //(q_in(pressure(start=95.5)),q_out(pressure(start=61.5)));
+//(q_in(pressure(start=95.5)),q_out(pressure(start=61.5)));
       extends Physiolibrary.SteadyStates.Interfaces.SteadyState(
                                                     stateName="Kidney-MyogenicDelay.PressureChange", state_start=InitialPressureChange);
 
@@ -8060,10 +8050,10 @@
                    extent={{-10,-10},{10,10}},         rotation=270,         origin={0,40})));
 
       Physiolibrary.Types.Fraction myogenicEffect;
-      Physiolibrary.Types.Pressure pressureChange(start=InitialPressureChange); //(start=0.161874);
-    //  Real pressureChangeSteadyState;
-     // Real adaptedPressure; //(start=77.9546);
-    //  Real interlobarPressure;
+      Physiolibrary.Types.Pressure pressureChange(start=InitialPressureChange);     //(start=0.161874);
+        //  Real pressureChangeSteadyState;
+        // Real adaptedPressure; //(start=77.9546);
+        //  Real interlobarPressure;
       parameter Physiolibrary.Types.Pressure InitialPressureChange=0;
 
       parameter Physiolibrary.Types.Frequency K_PressureChange(displayUnit="1/min") =  2.0/60;
@@ -8079,23 +8069,24 @@
       AfferentArteryMyogenicReceptors kidneyMyogenic(initialPressure(
             displayUnit="mmHg") = 9999.179056125)
         annotation (Placement(transformation(extent={{-46,50},{-26,70}})));
-    //initial equation
-     // adaptedPressure = interlobarPressure;
-      //der(adaptedPressure) = 0;
-     // der(pressureChange) = 0;
+    //initial equation
+     // adaptedPressure = interlobarPressure;
+      //der(adaptedPressure) = 0;
+     // der(pressureChange) = 0;
     equation
       q_in.q + q_out.q = 0;
 
       q_in.q = myogenicEffect * cond * (q_in.pressure - q_out.pressure);
-      kidneyMyogenic.InterlobarPressure = (q_in.pressure + q_out.pressure)/2;  //stredny tlak v arteriole
-     // der(adaptedPressure) = (1/(60*Tau_PressureAdoption)) * (interlobarPressure-adaptedPressure); //receptory sa adaptuju na tlak (polcas adaptacie nastane za 2hod a 45min)
-     // pressureChangeSteadyState = interlobarPressure-adaptedPressure;  //zmena tlaku sa taktiez adaptuje - neviem preco? => potom to vizera, ze stimulacia receptorov je postupny proces (polcas nabudenia stimulacie je 20 sekund)
-
-      state = pressureChange;
+      kidneyMyogenic.InterlobarPressure = (q_in.pressure + q_out.pressure)/2;
+//stredny tlak v arteriole
+// der(adaptedPressure) = (1/(60*Tau_PressureAdoption)) * (interlobarPressure-adaptedPressure); //receptory sa adaptuju na tlak (polcas adaptacie nastane za 2hod a 45min)
+// pressureChangeSteadyState = interlobarPressure-adaptedPressure;  //zmena tlaku sa taktiez adaptuje - neviem preco? => potom to vizera, ze stimulacia receptorov je postupny proces (polcas nabudenia stimulacie je 20 sekund)
+        state = pressureChange;
       change = K_PressureChange * (kidneyMyogenic.PressureChange_SteadyState - pressureChange);
 
-      PressureChangeOnCondEffect.u = pressureChange; //zmena tlaku aktivuje receptory
-      myogenicEffect = PressureChangeOnCondEffect.val; //stimulacia receptorov ma vplyv na vodivost (odpor) krvi aferentnej arterie
+      PressureChangeOnCondEffect.u = pressureChange;
+//zmena tlaku aktivuje receptory
+        myogenicEffect = PressureChangeOnCondEffect.val; //stimulacia receptorov ma vplyv na vodivost (odpor) krvi aferentnej arterie
       annotation ( Icon(graphics={
               Text(
                 extent={{-110,-68},{106,-32}},
@@ -8282,8 +8273,8 @@
         partial model Heart
           extends Physiomodel.CardioVascular.Microcirculation.Interfaces.BaseDO;
 
-        //parameter Real BasicLargeVeselsConductance( final quantity="Conductance", final displayUnit="ml/(min.mmHg)");
-        //parameter Real BasicSmallVeselsConductance( final quantity="Conductance", final displayUnit="ml/(min.mmHg)");
+//parameter Real BasicLargeVeselsConductance( final quantity="Conductance", final displayUnit="ml/(min.mmHg)");
+          //parameter Real BasicSmallVeselsConductance( final quantity="Conductance", final displayUnit="ml/(min.mmHg)");
         parameter Physiolibrary.Types.HydraulicConductance BasicLargeVeselsConductance( displayUnit="ml/(min.mmHg)");
         parameter Physiolibrary.Types.HydraulicConductance BasicSmallVeselsConductance( displayUnit="ml/(min.mmHg)");
 
@@ -9118,10 +9109,10 @@
 
     end Blood;
 
+
     model CardioVascularSystem
       extends Physiolibrary.Icons.CardioVascular;
-    //  extends Physiomodel.Library.Utilities.DynamicState(stateName="BloodVol.Vol", initType=Library.Utilities.Init.NoInit);
-
+    //  extends Physiomodel.Library.Utilities.DynamicState(stateName="BloodVol.Vol", initType=Library.Utilities.Init.NoInit);
     Heart.Heart heart
       annotation (Placement(transformation(extent={{0,-6},{26,20}})));
     Circulation.PulmonaryCirculation pulmonaryCirculation
@@ -9193,9 +9184,7 @@
           color={0,0,0},
           thickness=1,
           smooth=Smooth.None));
-
-    //  stateValue = bloodProperties.BloodVolume1.y;
-
+//  stateValue = bloodProperties.BloodVolume1.y;
       annotation ( Documentation(info="<html>
 <p><h4><font color=\"#008000\">Cardiovascular system</font></h4></p>
 <p><font style=\"color: #008000; \">Connect heart with pulmonary and systemic part. This connection contains pressures and blood flows before and after heart.</font></p>
@@ -9293,9 +9282,9 @@
       T.VolumeFlowRate KidneyPlasmaFlow(varName="Kidney-Flow.PlasmaFlow")
         "Kidney plasma flow."
       annotation (Placement(transformation(extent={{-36,170},{-30,176}})));
-      //Variable LeftAtrium_TMP(varName="LeftAtrium.TMP")
-      //    "Left atrium pressure gradient between inside and pericardium."
-      //annotation (Placement(transformation(extent={{-36,180},{-30,186}})));
+      //Variable LeftAtrium_TMP(varName="LeftAtrium.TMP")
+          //    "Left atrium pressure gradient between inside and pericardium."
+          //annotation (Placement(transformation(extent={{-36,180},{-30,186}})));
       T.VolumeFlowRate LeftHeart_BloodFlow(varName="LeftHeart-Flow.BloodFlow")
         "LeftHeart blood flow."
       annotation (Placement(transformation(extent={{-36,200},{-30,206}})));
@@ -9332,9 +9321,9 @@
       T.Pressure RightAtrium_Pressure(varName="RightAtrium.Pressure")
         "Blood pressure in right atrium."
       annotation (Placement(transformation(extent={{-36,310},{-30,316}})));
-      //Variable RightAtrium_TMP(varName="RightAtrium.TMP")
-      //    "Right atrium pressure gradient between inside and pericardium."
-      //annotation (Placement(transformation(extent={{-36,320},{-30,326}})));
+      //Variable RightAtrium_TMP(varName="RightAtrium.TMP")
+          //    "Right atrium pressure gradient between inside and pericardium."
+          //annotation (Placement(transformation(extent={{-36,320},{-30,326}})));
       T.VolumeFlowRate RightHeart_BloodFlow(varName="RightHeart-Flow.BloodFlow")
         "RightHeart blood flow."
       annotation (Placement(transformation(extent={{-36,340},{-30,346}})));
@@ -9983,7 +9972,6 @@
         annotation (        experiment(StopTime=864000));
       end CardioVascular_test_SI;
     end IO_Bus;
-
   annotation (Documentation(revisions="<html>
 <table cellspacing=\"2\" cellpadding=\"0\" border=\"0\"><tr>
 <td><p>Author:</p></td>
@@ -10036,18 +10024,17 @@
     package O2 "Body O2 Transport"
 
     partial model BloodO2Base
-    //start values is for tissues veins blood
-
+    //start values is for tissues veins blood
       parameter Boolean isSaturated = false;
 
       Physiolibrary.Types.Concentration tO2(start=0.75*8.14);
       Real aO2;
-    //  Real pO2(start=5.33,           unit="kPa");
-      // start=13,
+    //  Real pO2(start=5.33,           unit="kPa");
+        // start=13,
       Physiolibrary.Types.Fraction sO2CO(start=0.75);
       Physiolibrary.Types.Pressure pO2CO;
       Physiolibrary.Types.Concentration cO2Hb(start=6);
-      //
+      //
       Physiolibrary.Types.Fraction sCO;
 
       Physiolibrary.Types.Concentration ceHb;
@@ -10064,10 +10051,9 @@
 */
       Physiolibrary.Types.Fraction FCOHb(start=0);
 
-    //  Real pCO;
-    //  Real pCO2;
-      //(start=5);
-
+//  Real pCO;
+        //  Real pCO2;
+        //(start=5);
       Physiolibrary.Types.RealIO.FractionOutput sO2
                                           annotation (Placement(
             transformation(extent={{-30,-112},{10,-72}}),
@@ -10118,16 +10104,13 @@
             rotation=180,
             origin={90,-20})));
 
-    //  Real mlTOmmol_O2(unit="mMol/ml") = 8.18/0.182
-    //    "conversion constant for oxygen mass from ml to mMol";
-
-     // Real mlTOmmol_O2(unit="mMol/ml") = 1/(740*2*16/1000)
-     //   "conversion constant for oxygen mass from ml to mMol";
-                                                       //8.18 / 0.182
-                                                       //molar mass = 2*16 g/mol; density = 740 ml/g
-
-     // constant Real MiniliterPerLiter(final unit="ml/l")=1000;
-
+//  Real mlTOmmol_O2(unit="mMol/ml") = 8.18/0.182
+        //    "conversion constant for oxygen mass from ml to mMol";
+        // Real mlTOmmol_O2(unit="mMol/ml") = 1/(740*2*16/1000)
+        //   "conversion constant for oxygen mass from ml to mMol";
+        //8.18 / 0.182
+        //molar mass = 2*16 g/mol; density = 740 ml/g
+        // constant Real MiniliterPerLiter(final unit="ml/l")=1000;
       Physiolibrary.Types.RealIO.PressureOutput pO2(start=5330)
                                           annotation (Placement(
             transformation(extent={{2,-112},{42,-72}}), iconTransformation(
@@ -10157,70 +10140,64 @@
      parameter Real dadxMetHb = -0.7 "used by a";
      parameter Real dadxHbF = -0.25 "used by a";
 
-     //constant Real PaTOmmHg = 1/133;
-
-    equation
-    //   PO2 = PaTOmmHg*1000 * pO2;
-
-    //  pCOmmHg = PaTOmmHg*1000 * pCO;
-    //  pCO2mmHg = PaTOmmHg*1000 * pCO2;
-
-    //oxygen:
-      ceHb = ctHb * (1-FCOHb-FMetHb); //effective haemoglobin
-
-      assert(tO2 <= ceHb*(1.06), "Model does not support this high level of oxygen in blood. Maximum of oxygen concentration should be connected with efective hemoglobin concentration!");
-        //pO2,pCO,pCO2 .. Pa
-      //TODO: check units of solubility
-      aO2 = exp(log(0.0105)+(-0.0115*(T-T0))+0.5*0.00042*(T-T0)^2)/1000; //solubility
-      cdO2 = aO2*pO2;
-    /*  if (isSaturated) then
+//constant Real PaTOmmHg = 1/133;
+     equation
+//   PO2 = PaTOmmHg*1000 * pO2;
+//  pCOmmHg = PaTOmmHg*1000 * pCO;
+//  pCO2mmHg = PaTOmmHg*1000 * pCO2;
+//oxygen:
+        ceHb = ctHb * (1 - FCOHb - FMetHb);
+//effective haemoglobin
+        assert(tO2 <= ceHb * 1.06, "Model does not support this high level of oxygen in blood. Maximum of oxygen concentration should be connected with efective hemoglobin concentration!");
+//pO2,pCO,pCO2 .. Pa
+//TODO: check units of solubility
+        aO2 = exp(log(0.0105) + (-0.0115 * (T - T0)) + 0.5 * 0.00042 * (T - T0) ^ 2) / 1000;
+//solubility
+        cdO2 = aO2 * pO2;
+/*  if (isSaturated) then
     cdO2 = homotopy( tO2 - sO2*ceHb, tO2 - 0.9999*ceHb);
   else
     sO2 = homotopy( (tO2-cdO2)/ceHb,  tO2/ceHb);  // ctO2 = aO2*pO2 + ceHb*sO2;  nazaciatok postaci veskery kyslik mat iba na hemoglobine a potom pridat uz len to zrnko rozpusteneho..
-  end if; */
-     //TODO: why not sO2 = homotopy( (tO2-cdO2)/ceHb,  tO2/ceHb);
-      tO2 = aO2*pO2 + ceHb*sO2;
-    //  cO2Hb = tO2 - cdO2;
-      sO2 = cO2Hb/ceHb;
-      //TODO: check this: a=-0.88*(pH-7.4)+0.048*log(pCO2/5.33)-0.7*FMetHb+(0.3-0.25*FHbF)*cDPG/(5-1);
-      //TANH
-      a=dadpH*(pH-pH0)+dadlnpCO2*log(max(1e-15+1e-22*pCO2,pCO2/pCO20)) +dadxMetHb*FMetHb+(dadcDPG0 + dadcDPGxHbF*FHbF)*(cDPG/cDPG0 - 1); //log(pCO2/5330)
-
-      //orginal:
-      x=log(pO2CO/7000) - a - 0.055*(T-T0); //namiesto:  x=log(pO2CO/7) - a - 0.055*(T-37);
-      y-1.8747=x+h*tanh(k*x);
+  end if; */
+//TODO: why not sO2 = homotopy( (tO2-cdO2)/ceHb,  tO2/ceHb);
+        tO2 = aO2 * pO2 + ceHb * sO2;
+//  cO2Hb = tO2 - cdO2;
+        sO2 = cO2Hb / ceHb;
+//TODO: check this: a=-0.88*(pH-7.4)+0.048*log(pCO2/5.33)-0.7*FMetHb+(0.3-0.25*FHbF)*cDPG/(5-1);
+//TANH
+        a = dadpH * (pH - pH0) + dadlnpCO2 * log(max(1e-15 + 1e-22 * pCO2, pCO2 / pCO20)) + dadxMetHb * FMetHb + (dadcDPG0 + dadcDPGxHbF * FHbF) * (cDPG / cDPG0 - 1);
+//log(pCO2/5330)
+//orginal:
+        x = log(pO2CO / 7000) - a - 0.055 * (T - T0);
+//namiesto:  x=log(pO2CO/7) - a - 0.055*(T-37);
+        y - 1.8747 = x + h * tanh(k * x);
       k=0.5342857;
       h=3.5 + a;
-      y=log(sO2CO/(1-sO2CO));
-
-      //simplification:
-    /*  ey/ey0=ex*exp((3.5 + a)*tnh);  //TANH:  y-log(0.867/(1-0.867))=x+(3.5 + a)*tanh(0.5342857*x);
+      y=log(sO2CO/(1-sO2CO));
+//simplification:
+/*  ey/ey0=ex*exp((3.5 + a)*tnh);  //TANH:  y-log(0.867/(1-0.867))=x+(3.5 + a)*tanh(0.5342857*x);
   ey0=0.867/(1-0.867);  //y0=log(0.867/(1-0.867)); //1.8747
   tnh = (ex^(2*k) - 1) / (ex^(2*k) + 1);  // = tanh(k*x)
   ex=max(1e-15*(1+1e-6*pO2CO),(pO2CO/7.000) / exp(a + 0.055*(T-37)));  // = exp(x); x=log(max(1e-15*(1+1e-6*pO2CO),pO2CO/7000)) - a - 0.055*(T_degC-37);
   k=0.5342857;
   ey=sO2CO/(1-sO2CO); // = exp(y);  y=log(max(1e-15*(1+1e-6*sO2CO/(1-sO2CO)),sO2CO/(1-sO2CO)));
-  */
-        /************ O2 ********************/
-
-      /************ CO ********************/
-      //Haldane:
-     /* if (pCOmmHg<1e-10) then
+  */
+/************ O2 ********************/
+/************ CO ********************/
+//Haldane:
+/* if (pCOmmHg<1e-10) then
     sCO = 0;
     pO2CO = pO2;
     sO2CO = sO2;
     FCOHb = 0;/*
-  else*/
-     /*   pCO = sCO*pO2CO/ 218*sO2CO;
+  else*/
+/*   pCO = sCO*pO2CO/ 218*sO2CO;
     pO2CO = pO2 + 218*pCO;
     sO2CO = (cO2Hb + ctHb*FCOHb)/(ctHb*(1-FMetHb));
-    sCO = ctHb*FCOHb/(ctHb*(1-FMetHb));*/
-
-        {pCO,FCOHb,pO2CO,sO2CO}=homotopy({sCO*pO2CO/ 218*sO2CO,sCO*(1-FMetHb),pO2 + 218*pCO,(cO2Hb + ctHb*FCOHb)/(ctHb*(1-FMetHb))},
-        {0,0,pO2,sO2});
-    //  end if;
-
-    /*  ceHb = ctHb * (1-FCOHb-FMetHb); //effective haemoglobin
+    sCO = ctHb*FCOHb/(ctHb*(1-FMetHb));*/
+        {pCO, FCOHb, pO2CO, sO2CO} = homotopy({sCO * pO2CO / 218 * sO2CO, sCO * (1 - FMetHb), pO2 + 218 * pCO, (cO2Hb + ctHb * FCOHb) / (ctHb * (1 - FMetHb))}, {0, 0, pO2, sO2});
+//  end if;
+/*  ceHb = ctHb * (1-FCOHb-FMetHb); //effective haemoglobin
   aO2 = exp(log(0.0105)+(-0.0115*(T-37))+0.5*0.00042*(T-37)^2); //solubility
   tO2 = aO2*pO2 + ceHb*sO2;
   //Haldane:
@@ -10246,14 +10223,12 @@
   y=log(max(1e-15+1e-24*sO2CO/(1-sO2CO),sO2CO/(1-sO2CO)));
 
 */
-
-    //oxygen: working well:
-      //TANH
-    //  a=-0.88*(pH-7.4)+0.048*log(max(1e-15+1e-19*pCO2,pCO2/5.33))-0.7*FMetHb+(0.3-0.25*FHbF)*cDPG/(5-1); //Bohr coefficient: -der(log10(pO2),pH)=0.88/ln(10)=0.38, -der(ln(pO2),pH)=0.88
-    //  x=log(pO2CO/7);
-    //  x=log(max(1e-15+1e-19*pO2CO,pO2CO/7)) - a - 0.055*(T-37); //namiesto:  x=log(pO2CO/7) - a - 0.055*(T-37);
-    //  y=log(max(1e-15+1e-19*sO2CO/(1-sO2CO),sO2CO/(1-sO2CO)));
-
+//oxygen: working well:
+//TANH
+//  a=-0.88*(pH-7.4)+0.048*log(max(1e-15+1e-19*pCO2,pCO2/5.33))-0.7*FMetHb+(0.3-0.25*FHbF)*cDPG/(5-1); //Bohr coefficient: -der(log10(pO2),pH)=0.88/ln(10)=0.38, -der(ln(pO2),pH)=0.88
+//  x=log(pO2CO/7);
+//  x=log(max(1e-15+1e-19*pO2CO,pO2CO/7)) - a - 0.055*(T-37); //namiesto:  x=log(pO2CO/7) - a - 0.055*(T-37);
+//  y=log(max(1e-15+1e-19*sO2CO/(1-sO2CO),sO2CO/(1-sO2CO)));
       annotation (Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,
                 -100},{100,100}}), graphics={Rectangle(
               extent={{-100,100},{100,-100}},
@@ -10266,25 +10241,24 @@
     end BloodO2Base;
 
       model MeassureBloodO2
-        extends Physiomodel.Gases.O2.BloodO2Base;//_withoutCO_;
+        extends Physiomodel.Gases.O2.BloodO2Base;
+  //_withoutCO_;
       Physiolibrary.Chemical.Interfaces.ChemicalPort_a q_in annotation (
           Placement(transformation(extent={{-28,-116},{12,-76}}),
             iconTransformation(extent={{-20,-100},{20,-60}})));
       equation
-         q_in.q = 0;  //flows: mmol/min
+         q_in.q = 0;  //flows: mmol/min
          tO2 = q_in.conc; //mmol/l
       end MeassureBloodO2;
 
       model BloodO2_Siggaard
 
       extends BloodO2Base;
-                          //_withoutCO_;
-
-      //Physiolibrary.Chemical.Interfaces.ChemicalPort_a q_in;
-      //Physiolibrary.Chemical.Interfaces.ChemicalPort_b q_out;
-      //Physiolibrary.Chemical.Interfaces.ChemicalPort_b alveolar;
-      //Modelica.Blocks.Interfaces.RealInput
-
+                          //_withoutCO_;
+        //Physiolibrary.Chemical.Interfaces.ChemicalPort_a q_in;
+        //Physiolibrary.Chemical.Interfaces.ChemicalPort_b q_out;
+        //Physiolibrary.Chemical.Interfaces.ChemicalPort_b alveolar;
+        //Modelica.Blocks.Interfaces.RealInput
         Physiolibrary.Chemical.Interfaces.ChemicalPort_a q_in
           annotation (Placement(transformation(extent={{-100,-100},{-80,-80}}),
               iconTransformation(extent={{-100,-100},{-80,-80}})));
@@ -10304,21 +10278,21 @@
               rotation=270,
               origin={-40,-120})));
       equation
-      q_in.q + q_out.q + alveolar.q = 0;  //flows: mmol/min
-
-      alveolar.conc =cdO2;
-
-      q_in.conc = q_in.q/ BloodFlow; //mmol/l
-
-      //tO2 = MiniliterPerLiter * (-q_out.q/ BloodFlow); //mmol/l
-      tO2 =  (-q_out.q/ BloodFlow); //mmol/l
-
-      ceHb_ = ceHb;
-
+      q_in.q + q_out.q + alveolar.q = 0;
+//flows: mmol/min
+        alveolar.conc = cdO2;
+
+      q_in.conc = q_in.q/ BloodFlow;
+//mmol/l
+//tO2 = MiniliterPerLiter * (-q_out.q/ BloodFlow); //mmol/l
+        tO2 = -q_out.q / BloodFlow;
+//mmol/l
+        ceHb_ = ceHb;
       end BloodO2_Siggaard;
 
       model BloodO2_Siggaard_Liver
-        extends Physiomodel.Gases.O2.BloodO2Base;//_withoutCO_;
+        extends Physiomodel.Gases.O2.BloodO2Base;
+  //_withoutCO_;
       Physiolibrary.Chemical.Interfaces.ChemicalPort_a hepaticArty annotation (
           Placement(transformation(extent={{-120,-120},{-80,-80}}),
             iconTransformation(extent={{-120,-120},{-80,-80}})));
@@ -10342,16 +10316,15 @@
                                          annotation (Placement(transformation(extent={{-120,
                   -80},{-80,-40}}),     iconTransformation(extent={{-100,0},{-80,20}})));
       equation
-        GIT.q + hepaticArty.q + q_out.q + alveolar.q = 0;  //flows: mmol/min
-
-        alveolar.pressure =Physiolibrary.NonSIunits.PaTOmmHg
-                                                       *1000 * pO2;
-
-        hepaticArty.conc = hepaticArty.q/ HepaticArtyBloodFlow; //mmol/ml
-        GIT.conc = GIT.q/ GITBloodFlow; //mmol/ml
-
-        tO2 = MiniliterPerLiter * (-q_out.q/ (GITBloodFlow+HepaticArtyBloodFlow)); //mmol/l
-
+        GIT.q + hepaticArty.q + q_out.q + alveolar.q = 0;
+//flows: mmol/min
+        alveolar.pressure = Physiolibrary.NonSIunits.PaTOmmHg * 1000 * pO2;
+
+        hepaticArty.conc = hepaticArty.q/ HepaticArtyBloodFlow;
+//mmol/ml
+        GIT.conc = GIT.q / GITBloodFlow;
+//mmol/ml
+        tO2 = MiniliterPerLiter * (-q_out.q / (GITBloodFlow + HepaticArtyBloodFlow)); //mmol/l
         annotation (Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,
                   -100},{100,100}}), graphics={
               Rectangle(
@@ -10410,8 +10383,8 @@
           annotation (Placement(transformation(extent={{-54,-84},{-34,-64}})));
 
        Physiolibrary.Types.MolarFlowRate O2ToTissues(displayUnit="mmol/min");
-      // Real O2ToTissues2(displayUnit="mmol/min");
-      // Real O2ToTissues3(displayUnit="ml/min");
+      // Real O2ToTissues2(displayUnit="mmol/min");
+        // Real O2ToTissues3(displayUnit="ml/min");
        Physiolibrary.Types.VolumeFlowRate BloodFlow(displayUnit="ml/min");
       equation
        O2ToTissues = q_in.q + q_out.q;
@@ -11763,9 +11736,8 @@
         //  Real O2Use_ml_per_min;
         // Real O2Use_mmol_per_min;
         equation
-        //  O2Use_mmol_per_min = fromMLtoMMOL.q_MMOL.q;
-        //  O2Use_ml_per_min = -fromMLtoMMOL.q_ML.q;
-
+//  O2Use_mmol_per_min = fromMLtoMMOL.q_MMOL.q;
+//  O2Use_ml_per_min = -fromMLtoMMOL.q_ML.q;
           connect(O2Tissue.sO2, sO2)          annotation (Line(
               points={{-8,6},{-8,17},{11,17}},
               color={0,0,127},
@@ -11863,8 +11835,8 @@
                 extent={{-10,-10},{10,10}},
                 rotation=270,
                 origin={20,-110})));
-         // Real O2Use_ml_per_min;
-         // Real O2Use_mmol_per_min;
+         // Real O2Use_ml_per_min;
+          // Real O2Use_mmol_per_min;
           Modelica.Blocks.Math.Gain oxygenSolubility(k=1/1.005e-5)
             annotation (Placement(transformation(extent={{26,-96},{46,-76}})));
           Physiolibrary.Chemical.Components.Diffusion diffusion(useConductanceInput=true)
@@ -11875,9 +11847,8 @@
           Physiolibrary.Chemical.Sensors.ConcentrationMeasure concentrationMeasure
             annotation (Placement(transformation(extent={{-4,-84},{16,-64}})));
         equation
-         // O2Use_mmol_per_min = fromMLtoMMOL.q_MMOL.q;
-         // O2Use_ml_per_min = -fromMLtoMMOL.q_ML.q;
-
+// O2Use_mmol_per_min = fromMLtoMMOL.q_MMOL.q;
+// O2Use_ml_per_min = -fromMLtoMMOL.q_ML.q;
           connect(O2PermBasic.y, HgbOnPerm.yBase) annotation (Line(
               points={{61.75,-35},{64,-35},{64,-46}},
               color={0,0,127},
@@ -12287,8 +12258,7 @@
           import Physiomodel;
 
           import Modelica.Utilities.*;
-         // constant String OUTPUT_FILE = "setup/output_startValues.txt"; //"setup/output.txt"; //"setup/v2.txt";
-
+         // constant String OUTPUT_FILE = "setup/output_startValues.txt"; //"setup/output.txt"; //"setup/v2.txt";
         Physiomodel.CardioVascular.IO_Bus.InputFromFile_SI cardioVascularSystem
             annotation (Placement(transformation(extent={{40,72},{60,94}})));
           Physiomodel.Metabolism.IO_Bus.InputFromFile_SI
@@ -12364,9 +12334,8 @@
               color={0,0,255},
               thickness=0.5,
               smooth=Smooth.None));
-        //if terminal() then
-
-        /*   Streams.print("cardioVascularSystem.busConnector.Bone_PCO2\n"+String(cardioVascularSystem.busConnector.Bone_PCO2),OUTPUT_FILE);
+//if terminal() then
+/*   Streams.print("cardioVascularSystem.busConnector.Bone_PCO2\n"+String(cardioVascularSystem.busConnector.Bone_PCO2),OUTPUT_FILE);
 
 Streams.print("cardioVascularSystem.busConnector.Brain_PCO2\n"+String(cardioVascularSystem.busConnector.Brain_PCO2),OUTPUT_FILE);
 Streams.print("cardioVascularSystem.busConnector.Fat_PCO2\n"+String(cardioVascularSystem.busConnector.Fat_PCO2),OUTPUT_FILE);
@@ -12429,8 +12398,8 @@
 Streams.print("gases.oxygen.tissuesO2.skinO2.O2Tissue.pO2|"+String(gases.oxygen.tissuesO2.skinO2.O2Tissue.pO2),OUTPUT_FILE);
 Streams.print("gases.oxygen.veinsO2.a|"+String(gases.oxygen.veinsO2.a),OUTPUT_FILE);
 Streams.print("gases.oxygen.veinsO2.FCOHb|"+String(gases.oxygen.veinsO2.FCOHb),OUTPUT_FILE);
-Streams.print("gases.oxygen.veinsO2.pO2|"+String(gases.oxygen.veinsO2.pO2),OUTPUT_FILE);*/
-        //end if;
+Streams.print("gases.oxygen.veinsO2.pO2|"+String(gases.oxygen.veinsO2.pO2),OUTPUT_FILE);*/
+//end if;
           connect(ventilation_const.busConnector, proteins.busConnector) annotation (
               Line(
               points={{-26,-66},{-40,-66},{-40,-18},{-38,-18}},
@@ -12500,7 +12469,7 @@
           cO2Hb(start=8.16),
           tO2(start=8.161))
           annotation (Placement(transformation(extent={{-16,-18},{4,2}})));
-         // sO2CO(start=0.951486),
+         // sO2CO(start=0.951486),
                                                /**/
        Real x;
         Physiolibrary.Chemical.Components.GasSolubility
@@ -12520,12 +12489,11 @@
       TissuesO2 tissuesO2
         annotation (Placement(transformation(extent={{-14,-94},{6,-74}})));
       initial equation
-        //if Artys.STEADY then
-           // Veins.soluteMass
-          // x = -O2Lung.q_out.q;
-        //   x = ((-O2Lung.q_out.q - tissuesO2.O2ToTissues)/O2Lung.BloodFlow)*Veins.SolventVolume;
-           // end if;
-
+//if Artys.STEADY then
+// Veins.soluteMass
+// x = -O2Lung.q_out.q;
+//   x = ((-O2Lung.q_out.q - tissuesO2.O2ToTissues)/O2Lung.BloodFlow)*Veins.SolventVolume;
+// end if;
       equation
         x = ((-O2Lung.q_out.q - tissuesO2.O2ToTissues)/O2Lung.BloodFlow)*veins.volume;
         connect(pulmShortCircuitFlow.u1, busConnector.CardiacOutput)
@@ -13216,8 +13184,7 @@
         constant Physiolibrary.Types.MolarEnergy dHhO=-105000;
         constant Physiolibrary.Types.MolarEnergy dHo=50000;
         constant Physiolibrary.Types.MolarEnergy dH_HbuDANH2=0;
-        // dHhD=0, dHhO=-104000, dHo=12700, dH_HbuDANH2=0;                           // dHhD=48600, dHhO=-104000, dHo=50000, dH_HbuDANH2=0;
-
+        // dHhD=0, dHhO=-104000, dHo=12700, dH_HbuDANH2=0;                           // dHhD=48600, dHhO=-104000, dHo=50000, dH_HbuDANH2=0;
         parameter Boolean storeResults=false;
         parameter Boolean loadStarts=true;
 
@@ -13576,11 +13543,10 @@
         Real pK;
         Real aCO2(final displayUnit="mmol/(l.kPa)");
          Physiolibrary.Types.Concentration cdCO2(displayUnit="mmol/l");
-      // start=3,
-      //  Physiolibrary.Types.Pressure pCO2(start=6000,            displayUnit="kPa");
-      //  start=6,
-       // constant Real MiniliterPerLiter(final displayUnit="ml/l")=1000;
-
+      // start=3,
+        //  Physiolibrary.Types.Pressure pCO2(start=6000,            displayUnit="kPa");
+        //  start=6,
+        // constant Real MiniliterPerLiter(final displayUnit="ml/l")=1000;
          Physiolibrary.Types.RealIO.ConcentrationOutput cHCO3(
                                               displayUnit="mmol/l")
         "outgoing concentration of HCO3"                                                             annotation (Placement(
@@ -13604,14 +13570,14 @@
               extent={{-20,-20},{20,20}},
               rotation=270,
               origin={40,-120})));               /*start=40,*/
-      equation
-        //Henderson-Hasselbalch equation:
-        pK = 6.1 + (-0.0026)*(T-310.15);
-        aCO2 = 0.00023 * 10^(-0.0092*(T-310.15)); //solubility depends on temperature
-        cdCO2 = aCO2*pCO2;
-       // pH = if ( cdCO2 > 1e-8) then  pK + log10(max(1e-15,cHCO3/cdCO2)) else pK;
-        cdCO2 * 10^(pH-pK) = cHCO3;
-
+      equation
+//Henderson-Hasselbalch equation:
+        pK = 6.1 + (-0.0026) * (T - 310.15);
+        aCO2 = 0.00023 * 10^(-0.0092*(T-310.15));
+//solubility depends on temperature
+        cdCO2 = aCO2 * pCO2;
+// pH = if ( cdCO2 > 1e-8) then  pK + log10(max(1e-15,cHCO3/cdCO2)) else pK;
+        cdCO2 * 10 ^ (pH - pK) = cHCO3;
         annotation ( Documentation(revisions="<html>
 
 <table cellspacing=\"2\" cellpadding=\"0\" border=\"0\"><tr>
@@ -13643,16 +13609,14 @@
         import Modelica.Math;
 
         Physiolibrary.Types.Concentration tCO2_P(start=24, displayUnit="mmol/l");
-        //start=24,
-
+        //start=24,
         Real pK_ery;
         Physiolibrary.Types.GasSolubility aCO2_ery( displayUnit="mmol/l/mmHg");
         Physiolibrary.Types.Concentration tCO2_ery( displayUnit="mmol/l");
 
          Physiolibrary.Types.Concentration tCO2( displayUnit="mmol/l");
 
-      //  constant Real MiniliterPerLiter(final displayUnit="ml/l")=1000;
-
+//  constant Real MiniliterPerLiter(final displayUnit="ml/l")=1000;
          Physiolibrary.Types.RealIO.pHInput pH_ery
         "outgoing intracellular erytrocytes pH"
                                         annotation (Placement(transformation(extent={{-120,10},
@@ -13671,18 +13635,16 @@
               rotation=180,
               origin={90,0})));
 
-      equation
-        //total plasma CO2 from SimpleCO2Solution
-        tCO2_P = cHCO3 + cdCO2;
-
-        //erythrocytes:
-        pK_ery = 6.125 - log10(1+10^(pH_ery-7.84-0.06*sO2));
+      equation
+//total plasma CO2 from SimpleCO2Solution
+        tCO2_P = cHCO3 + cdCO2;
+//erythrocytes:
+        pK_ery = 6.125 - log10(1 + 10 ^ (pH_ery - 7.84 - 0.06 * sO2));
         tCO2_ery=aCO2_ery*pCO2*(1+10^(pH_ery-pK_ery));
-        aCO2_ery=0.000195; //solubility 0.23 (mmol/l)/kPa at 25degC
-
-        //plasma+erythrocyte
-        tCO2 = tCO2_ery*Hct + tCO2_P*(1-Hct);
-
+        aCO2_ery=0.000195;
+//solubility 0.23 (mmol/l)/kPa at 25degC
+//plasma+erythrocyte
+        tCO2 = tCO2_ery * Hct + tCO2_P * (1 - Hct);
         annotation (Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,
                   -100},{100,100}}), graphics={Rectangle(
                 extent={{-100,100},{100,-100}},
@@ -13733,8 +13695,7 @@
                                          annotation (Placement(transformation(extent={{-120,
                   -80},{-80,-40}}),     iconTransformation(extent={{-100,-10},{-80,10}})));
       equation
-        q_in.conc = q_in.q/ BloodFlow; //mmol/l
-
+        q_in.conc = q_in.q/ BloodFlow; //mmol/l
         tCO2 = (-q_out.q/BloodFlow); //mmol/l
 
         annotation (Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,
@@ -13839,7 +13800,7 @@
           annotation (Placement(transformation(extent={{10,-10},{-10,10}},
               rotation=270,
               origin={-12,-10})));
-      //1000 * 1.977/40.01
+      //1000 * 1.977/40.01
         Physiomodel.Gases.CO2.MeassureBloodCO2 veinsCO2(tCO2_P(start=27.4), pCO2(
               start=6240))
           annotation (Placement(transformation(extent={{-96,22},{-76,42}})));
@@ -14199,8 +14160,8 @@
             iconTransformation(extent={{-20,-100},{20,-60}})));
       equation
         q_in.q=0;
-        tCO2 = q_in.conc;// * MiniliterPerLiter;  //mmol/l
-
+        tCO2 = q_in.conc;
+// * MiniliterPerLiter;  //mmol/l
         annotation (Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,
                   -100},{100,100}}), graphics={Rectangle(
                 extent={{-100,100},{100,-100}},
@@ -14263,7 +14224,7 @@
   aCO2 = 0.23 * 10^(-0.0092*(T-37)); //solubility depends on temperature
 
 */
-        //total interstitial CO2 from SimpleCO2Solution
+//total interstitial CO2 from SimpleCO2Solution
         tCO2 = cHCO3 + cdCO2;
 
         annotation (Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,
@@ -14348,9 +14309,8 @@
 
         q_in.q + q_out.q = 0;
         q_in.conc = (q_in.q/BloodFlow);
-        tCO2 = q_in.conc; //=(-q_out.q/BloodFlow);  //mmol/l
-
-      /*
+        tCO2 = q_in.conc; //=(-q_out.q/BloodFlow);  //mmol/l
+/*
   //total plasma CO2 from SimpleCO2Solution
   tCO2_P = cHCO3 + cdCO2;
 
@@ -15931,8 +15891,7 @@
       model BloodCO2
 
        extends BloodCO2TransportBase;
-      // extends Physiolibrary.Icons.LungShunt;
-
+      // extends Physiolibrary.Icons.LungShunt;
       Physiolibrary.Chemical.Interfaces.ChemicalPort_a alveolar_outflow
         "CO2 outflow from blood to alveol space in mmol/min"
           annotation (Placement(transformation(extent={{-20,80},{20,120}}),
@@ -16517,8 +16476,7 @@
       Physiolibrary.Types.Constants.OneConst one
         annotation (Placement(transformation(extent={{8,-34},{16,-26}})));
       equation
-       // efferentPath.TotalDrive=homotopy(actual=afferentPath.TotalDrive, simplified=1.045922);
-
+// efferentPath.TotalDrive=homotopy(actual=afferentPath.TotalDrive, simplified=1.045922);
         connect(busConnector, afferentPath.busConnector)      annotation (Line(
             points={{-70,90},{61.8,90},{61.8,40.2}},
             color={0,0,255},
@@ -16826,13 +16784,13 @@
       model CentralChemoreceptors
           extends Physiolibrary.Icons.RespiratoryCenter;
 
-          parameter Real data[:,3]={{6.60,0.0,0},{6.85,10.0,0},{7.07,1.0,-8.0},{7.50,0.0,0}}; //{{6.60,0.0,0},{6.87,10.0,0},{7.12,1.0,-8.0},{7.50,0.0,0}};
+          parameter Real data[:,3]={{6.60,0.0,0},{6.85,10.0,0},{7.07,1.0,-8.0},{7.50,0.0,0}};         //{{6.60,0.0,0},{6.87,10.0,0},{7.12,1.0,-8.0},{7.50,0.0,0}};
         Physiolibrary.Types.RealIO.FractionOutput CentralChemoreceptors
           annotation (Placement(transformation(extent={{80,-20},{120,20}}),
               iconTransformation(extent={{74,20},{114,60}})));
         Physiolibrary.Types.RealIO.pHInput Brain_pH_intracellular
           annotation (Placement(transformation(extent={{-100,40},{-60,80}}),
-              iconTransformation(extent={{-100,40},{-60,80}})));                                                //orginal data from Coleman {{6.60,0.0,0},{6.87,10.0,0},{7.22,1.0,-8.0},{7.50,0.0,0}}) was corrected, becase the normal intracellular pH in neuron cells is 7.16
+              iconTransformation(extent={{-100,40},{-60,80}})));                                                        //orginal data from Coleman {{6.60,0.0,0},{6.87,10.0,0},{7.22,1.0,-8.0},{7.50,0.0,0}}) was corrected, becase the normal intracellular pH in neuron cells is 7.16
       Physiolibrary.Blocks.Interpolation.Curve curve(
         x=data[:, 1],
         y=data[:, 2],
@@ -16877,8 +16835,8 @@
               extent={{-20,-20},{20,20}},
               rotation=90,
               origin={-20,100})));
-        parameter Real PhEffect[:,3]={{7.1,2,0},{7.4,0.4,-3},{7.7,0,0}}; //Orginal values from Coleman {{ 7.10,  2.0,  0}, { 7.44,  0.4,  -3.0}, { 7.70,  0.0,  0}} was corrected, because normal arteries pH is not 7.44 but 7.4
-        parameter Real PO2Effect[:,3]={{  30,  10.0,  0}, {  60,   2.0,  -0.05}, {  85,   0.5,  -0.005}, { 200,   0.2,  0}}; //Orginal values from Coleman {{  30,  10.0,  0}, {  60,   2.0,  -0.05}, {  94,   0.5,  -0.005}, { 400,   0.2,  0}} was corrected, because normal arteries pO2 is not 94 but 85
+        parameter Real PhEffect[:,3]={{7.1,2,0},{7.4,0.4,-3},{7.7,0,0}};         //Orginal values from Coleman {{ 7.10,  2.0,  0}, { 7.44,  0.4,  -3.0}, { 7.70,  0.0,  0}} was corrected, because normal arteries pH is not 7.44 but 7.4
+        parameter Real PO2Effect[:,3]={{  30,  10.0,  0}, {  60,   2.0,  -0.05}, {  85,   0.5,  -0.005}, { 200,   0.2,  0}};         //Orginal values from Coleman {{  30,  10.0,  0}, {  60,   2.0,  -0.05}, {  94,   0.5,  -0.005}, { 400,   0.2,  0}} was corrected, because normal arteries pO2 is not 94 but 85
         parameter Real PO2Effect_original[:,3]={{  30,  10.0,  0}, {  60,   2.0,  -0.05}, {  94,   0.5,  -0.005}, { 200,   0.2,  0}};
         parameter Real SteadyState[:,3]={{  0,  0,  0}, {  1,  1,  0.3}, { 10,  2,  0}};
         parameter Physiolibrary.Types.Time Tau(displayUnit="h") = 20*60*60;
@@ -17173,9 +17131,9 @@
 
         parameter Physiolibrary.Types.Fraction DeadSpaceSlope =   0.20;
         parameter Physiolibrary.Types.Volume DeadSpaceMin =                            60.0e-6;
-        parameter Real[:,3] DriveOnTidalVolume =  {{  0,     0,    0}, {  1,   450,  400}, { 10,  2630,    0}};  //corrected from {{  0,     0,    0}, {  1,   550,  400}, { 10,  2630,    0}}
-
-      // Real TidalVolumeBasic;
+        parameter Real[:,3] DriveOnTidalVolume =  {{  0,     0,    0}, {  1,   450,  400}, { 10,  2630,    0}};  
+//corrected from {{  0,     0,    0}, {  1,   550,  400}, { 10,  2630,    0}}
+        // Real TidalVolumeBasic;
       Physiolibrary.Blocks.Interpolation.Curve curve(
         x=DriveOnTidalVolume[:, 1],
         y=DriveOnTidalVolume[:, 2],
@@ -17207,8 +17165,8 @@
         Modelica.Blocks.Math.Add add
           annotation (Placement(transformation(extent={{2,-86},{22,-66}})));
       equation
-      //  u=RespiratoryCenterOutput_MotorNerveActivity; //curve x value
-      /*
+//  u=RespiratoryCenterOutput_MotorNerveActivity; //curve x value
+/*
   TidalVolumeBasic  =
       curve.val
     * Thorax_LungInflation
@@ -17287,9 +17245,8 @@
 
       model AlveolarVentilation_STPD
         extends Physiolibrary.Icons.Lungs;
-      //  parameter Real EnvironmentPressure(final displayUnit="mmHg");
-      //  parameter Real EnvironmentTemperature(final displayUnit="degC");
-
+      //  parameter Real EnvironmentPressure(final displayUnit="mmHg");
+        //  parameter Real EnvironmentTemperature(final displayUnit="degC");
         Physiolibrary.Types.RealIO.FrequencyInput RespRate
                                                annotation (Placement(transformation(
                 extent={{26,68},{40,82}}),    iconTransformation(
@@ -17513,8 +17470,8 @@
 
       model AlveolarVentilation
         extends Physiolibrary.Icons.Lungs;
-      //  parameter Real EnvironmentPressure(final displayUnit="mmHg");
-      //  parameter Real EnvironmentTemperature(final displayUnit="degC");
+      //  parameter Real EnvironmentPressure(final displayUnit="mmHg");
+        //  parameter Real EnvironmentTemperature(final displayUnit="degC");
       Physiolibrary.Chemical.Interfaces.ChemicalPort_b expired annotation (
           extent=[-10,-110; 10,-90], Placement(transformation(extent={{68,18},{
                 88,38}}), iconTransformation(extent={{90,70},{110,90}})));
@@ -17816,8 +17773,7 @@
       package IO_Bus
       extends Physiolibrary.Types.IO_Bus;
         redeclare model extends Variables
-        //  extends Physiolibrary.Icons.Ventilation;
-
+        //  extends Physiolibrary.Icons.Ventilation;
         T.Frequency RespiratoryCenter_RespRate(varName="RespiratoryCenter-Output.Rate")
           "Respiration rate."
         annotation (Placement(transformation(extent={{-44,-62},{-38,-56}})));
@@ -17925,6 +17881,7 @@
               textString="pH")}));
     end Gases;
 
+
     package IO_Bus
       extends Physiolibrary.Types.IO_Bus;
 
@@ -17960,8 +17917,7 @@
         import Physiomodel;
 
         import Modelica.Utilities.*;
-       // constant String OUTPUT_FILE = "setup/output_startValues.txt"; //"setup/output.txt"; //"setup/v2.txt";
-
+       // constant String OUTPUT_FILE = "setup/output_startValues.txt"; //"setup/output.txt"; //"setup/v2.txt";
       Physiomodel.CardioVascular.IO_Bus.InputFromFile cardioVascularSystem
           annotation (Placement(transformation(extent={{40,72},{60,94}})));
         Physiomodel.Metabolism.IO_Bus.InputFromFile
@@ -18129,8 +18085,7 @@
         import Physiomodel;
 
         import Modelica.Utilities.*;
-       // constant String OUTPUT_FILE = "setup/output_startValues.txt"; //"setup/output.txt"; //"setup/v2.txt";
-
+       // constant String OUTPUT_FILE = "setup/output_startValues.txt"; //"setup/output.txt"; //"setup/v2.txt";
       Physiomodel.CardioVascular.IO_Bus.InputFromFile_SI cardioVascularSystem
           annotation (Placement(transformation(extent={{40,72},{60,94}})));
         Physiomodel.Metabolism.IO_Bus.InputFromFile_SI
@@ -18224,9 +18179,8 @@
             color={0,0,255},
             thickness=0.5,
             smooth=Smooth.None));
-      //if terminal() then
-
-      /*   Streams.print("cardioVascularSystem.busConnector.Bone_PCO2\n"+String(cardioVascularSystem.busConnector.Bone_PCO2),OUTPUT_FILE);
+//if terminal() then
+/*   Streams.print("cardioVascularSystem.busConnector.Bone_PCO2\n"+String(cardioVascularSystem.busConnector.Bone_PCO2),OUTPUT_FILE);
 
 Streams.print("cardioVascularSystem.busConnector.Brain_PCO2\n"+String(cardioVascularSystem.busConnector.Brain_PCO2),OUTPUT_FILE);
 Streams.print("cardioVascularSystem.busConnector.Fat_PCO2\n"+String(cardioVascularSystem.busConnector.Fat_PCO2),OUTPUT_FILE);
@@ -18289,8 +18243,8 @@
 Streams.print("gases.oxygen.tissuesO2.skinO2.O2Tissue.pO2|"+String(gases.oxygen.tissuesO2.skinO2.O2Tissue.pO2),OUTPUT_FILE);
 Streams.print("gases.oxygen.veinsO2.a|"+String(gases.oxygen.veinsO2.a),OUTPUT_FILE);
 Streams.print("gases.oxygen.veinsO2.FCOHb|"+String(gases.oxygen.veinsO2.FCOHb),OUTPUT_FILE);
-Streams.print("gases.oxygen.veinsO2.pO2|"+String(gases.oxygen.veinsO2.pO2),OUTPUT_FILE);*/
-      //end if;
+Streams.print("gases.oxygen.veinsO2.pO2|"+String(gases.oxygen.veinsO2.pO2),OUTPUT_FILE);*/
+//end if;
         annotation (          experiment(StopTime=864000, Tolerance=1e-005));
       end Gases_test_SI;
 
@@ -18298,8 +18252,7 @@
         import Physiomodel;
 
         import Modelica.Utilities.*;
-       // constant String OUTPUT_FILE = "setup/output_startValues.txt"; //"setup/output.txt"; //"setup/v2.txt";
-
+       // constant String OUTPUT_FILE = "setup/output_startValues.txt"; //"setup/output.txt"; //"setup/v2.txt";
         Physiomodel.Setup.IO_Bus.InputFromFile_SI     setup
           annotation (Placement(transformation(extent={{-16,-106},{4,-86}})));
         Physiomodel.Gases.Gases gases
@@ -18345,9 +18298,8 @@
             color={0,0,255},
             thickness=0.5,
             smooth=Smooth.None));
-      //if terminal() then
-
-      /*   Streams.print("cardioVascularSystem.busConnector.Bone_PCO2\n"+String(cardioVascularSystem.busConnector.Bone_PCO2),OUTPUT_FILE);
+//if terminal() then
+/*   Streams.print("cardioVascularSystem.busConnector.Bone_PCO2\n"+String(cardioVascularSystem.busConnector.Bone_PCO2),OUTPUT_FILE);
 
 Streams.print("cardioVascularSystem.busConnector.Brain_PCO2\n"+String(cardioVascularSystem.busConnector.Brain_PCO2),OUTPUT_FILE);
 Streams.print("cardioVascularSystem.busConnector.Fat_PCO2\n"+String(cardioVascularSystem.busConnector.Fat_PCO2),OUTPUT_FILE);
@@ -18410,8 +18362,8 @@
 Streams.print("gases.oxygen.tissuesO2.skinO2.O2Tissue.pO2|"+String(gases.oxygen.tissuesO2.skinO2.O2Tissue.pO2),OUTPUT_FILE);
 Streams.print("gases.oxygen.veinsO2.a|"+String(gases.oxygen.veinsO2.a),OUTPUT_FILE);
 Streams.print("gases.oxygen.veinsO2.FCOHb|"+String(gases.oxygen.veinsO2.FCOHb),OUTPUT_FILE);
-Streams.print("gases.oxygen.veinsO2.pO2|"+String(gases.oxygen.veinsO2.pO2),OUTPUT_FILE);*/
-      //end if;
+Streams.print("gases.oxygen.veinsO2.pO2|"+String(gases.oxygen.veinsO2.pO2),OUTPUT_FILE);*/
+//end if;
       connect(gases.busConnector, electrolytes1.busConnector) annotation (Line(
           points={{-60,-46},{-6,-46},{-6,-22},{70,-22}},
           color={0,0,255},
@@ -18468,8 +18420,7 @@
         import Physiomodel;
 
         import Modelica.Utilities.*;
-       // constant String OUTPUT_FILE = "setup/output_startValues.txt"; //"setup/output.txt"; //"setup/v2.txt";
-
+       // constant String OUTPUT_FILE = "setup/output_startValues.txt"; //"setup/output.txt"; //"setup/v2.txt";
       Physiomodel.CardioVascular.IO_Bus.InputFromFile_SI cardioVascularSystem
           annotation (Placement(transformation(extent={{40,72},{60,94}})));
         Physiomodel.Metabolism.IO_Bus.InputFromFile_SI
@@ -18563,9 +18514,8 @@
             color={0,0,255},
             thickness=0.5,
             smooth=Smooth.None));
-      //if terminal() then
-
-      /*   Streams.print("cardioVascularSystem.busConnector.Bone_PCO2\n"+String(cardioVascularSystem.busConnector.Bone_PCO2),OUTPUT_FILE);
+//if terminal() then
+/*   Streams.print("cardioVascularSystem.busConnector.Bone_PCO2\n"+String(cardioVascularSystem.busConnector.Bone_PCO2),OUTPUT_FILE);
 
 Streams.print("cardioVascularSystem.busConnector.Brain_PCO2\n"+String(cardioVascularSystem.busConnector.Brain_PCO2),OUTPUT_FILE);
 Streams.print("cardioVascularSystem.busConnector.Fat_PCO2\n"+String(cardioVascularSystem.busConnector.Fat_PCO2),OUTPUT_FILE);
@@ -18628,12 +18578,11 @@
 Streams.print("gases.oxygen.tissuesO2.skinO2.O2Tissue.pO2|"+String(gases.oxygen.tissuesO2.skinO2.O2Tissue.pO2),OUTPUT_FILE);
 Streams.print("gases.oxygen.veinsO2.a|"+String(gases.oxygen.veinsO2.a),OUTPUT_FILE);
 Streams.print("gases.oxygen.veinsO2.FCOHb|"+String(gases.oxygen.veinsO2.FCOHb),OUTPUT_FILE);
-Streams.print("gases.oxygen.veinsO2.pO2|"+String(gases.oxygen.veinsO2.pO2),OUTPUT_FILE);*/
-      //end if;
+Streams.print("gases.oxygen.veinsO2.pO2|"+String(gases.oxygen.veinsO2.pO2),OUTPUT_FILE);*/
+//end if;
         annotation (          experiment(StopTime=1e+006, Tolerance=1e-005));
       end GasesAndElectrolytes_test_SI;
     end IO_Bus;
-
     annotation (Documentation(revisions="<html>
 <table cellspacing=\"2\" cellpadding=\"0\" border=\"0\"><tr>
 <td><p>Author:</p></td>
@@ -18758,27 +18707,26 @@
                   {120,20}}), iconTransformation(extent={{80,-20},{120,20}})));
       equation
          ArtyFractGz = artyFractGz[Status_Posture];
-         VeinFractGz = veinFractGz[Status_Posture]; //in legs veins are valves
-
-         TorsoArtyGradient  =  TorsoHeight * GravityAcceleration * BloodDensity * ArtyFractGz;  //Hydrostatic pressure: P=ro.g.h
-         //cm *  0.01 m/cm * 9.81 m/s² * 1060 kg/m3 * 1/133.322 mmHg/Pa
-         //= height[cm] * 0.77996129671022036873134216408395 [mmHg]
-         //Blood density = 1060 kg/m3: Cutnell, John & Johnson, Kenneth. Physics, Fourth Edition. Wiley, 1998: 308.
-
-         //bloodDensity = 1060 kg/m3
-         //gravityAcceleration = 9.81 m/s2
-         //Pa2mmHg = 1/133.322 mmHg/Pa
-         //cm2m = 0.01 m/cm
-         //averageHydrostaticHeight = TorsoCM * postureCoef[Status_Posture]
-         //hydrostaticPressure = averageHydrostaticHeight * cm2m * bloodDensity * gravityAcceleration * Pa2mmHg
-         //                    = 0.77996 * averageHydrostaticHeight
-
-         TorsoVeinGradient  =  TorsoHeight * GravityAcceleration * BloodDensity * VeinFractGz;
+         VeinFractGz = veinFractGz[Status_Posture];
+//in legs veins are valves
+        TorsoArtyGradient = TorsoHeight * GravityAcceleration * BloodDensity * ArtyFractGz;
+//Hydrostatic pressure: P=ro.g.h
+//cm *  0.01 m/cm * 9.81 m/s² * 1060 kg/m3 * 1/133.322 mmHg/Pa
+//= height[cm] * 0.77996129671022036873134216408395 [mmHg]
+//Blood density = 1060 kg/m3: Cutnell, John & Johnson, Kenneth. Physics, Fourth Edition. Wiley, 1998: 308.
+//bloodDensity = 1060 kg/m3
+//gravityAcceleration = 9.81 m/s2
+//Pa2mmHg = 1/133.322 mmHg/Pa
+//cm2m = 0.01 m/cm
+//averageHydrostaticHeight = TorsoCM * postureCoef[Status_Posture]
+//hydrostaticPressure = averageHydrostaticHeight * cm2m * bloodDensity * gravityAcceleration * Pa2mmHg
+//                    = 0.77996 * averageHydrostaticHeight
+        TorsoVeinGradient = TorsoHeight * GravityAcceleration * BloodDensity * VeinFractGz;
 
          Arty  = max( (fromPressure + TorsoArtyGradient), 0);
-         Vein  = max( toPressure + ( TorsoVeinGradient * Pump_Effect), 0);  //only lower torso has LegMusclePump_Effect
-         Capy  = max( ( Alpha * Arty)   + ( 1.0 - Alpha)  * Vein, 0);
-
+         Vein  = max( toPressure + ( TorsoVeinGradient * Pump_Effect), 0);
+//only lower torso has LegMusclePump_Effect
+        Capy = max(Alpha * Arty + (1.0 - Alpha) * Vein, 0);
        annotation (
       Documentation(info="<HTML>
 </HTML>
@@ -18800,25 +18748,25 @@
          parameter Real TiltTable_Degrees( final quantity="Angle", final displayUnit="Deg")= 0;
 
         TorsoHydrostatics UpperTorsoHydrostatics(
-          artyFractGz={0,1,1,sin(Modelica.SIunits.Conversions.from_deg(
+          artyFractGz={0,1,1,sin(Modelica.Units.Conversions.from_deg(
               TiltTable_Degrees)),1.76947},
-          veinFractGz={0,1,1,sin(Modelica.SIunits.Conversions.from_deg(
+          veinFractGz={0,1,1,sin(Modelica.Units.Conversions.from_deg(
               TiltTable_Degrees)),1.76947},
           TorsoHeight=-0.1)
           annotation (Placement(transformation(extent={{-12,34},{16,62}})));
 
         TorsoHydrostatics LowerTorsoHydrostatics(
-          artyFractGz={0,0.7,1,sin(Modelica.SIunits.Conversions.from_deg(
+          artyFractGz={0,0.7,1,sin(Modelica.Units.Conversions.from_deg(
               TiltTable_Degrees)),0.0190301},
-          veinFractGz={0.2,0.7,1,0.2 + sin(Modelica.SIunits.Conversions.from_deg(
+          veinFractGz={0.2,0.7,1,0.2 + sin(Modelica.Units.Conversions.from_deg(
               TiltTable_Degrees)),0.0190301},
           TorsoHeight=0.5)
           annotation (Placement(transformation(extent={{-12,-42},{16,-14}})));
 
         TorsoHydrostatics MiddleTorsoHydrostatics(
-          artyFractGz={0,1,1,sin(Modelica.SIunits.Conversions.from_deg(
+          artyFractGz={0,1,1,sin(Modelica.Units.Conversions.from_deg(
               TiltTable_Degrees)),-0.00024891},
-          veinFractGz={0,1,1,sin(Modelica.SIunits.Conversions.from_deg(
+          veinFractGz={0,1,1,sin(Modelica.Units.Conversions.from_deg(
               TiltTable_Degrees)),-0.00024891},
           TorsoHeight=0.04)
           annotation (Placement(transformation(extent={{-12,-4},{16,24}})));
@@ -19078,8 +19026,8 @@
         Physiolibrary.Types.AmountOfSubstance ECFVActiveOsmoles;
         Physiolibrary.Types.AmountOfSubstance ICFVActiveOsmoles;
         Physiolibrary.Types.AmountOfSubstance ActiveOsmoles(start=11.6831341496947);
-      //  Real Osm_conc_CellWall;
-        //Real Osm_conc_Osmoreceptors;
+      //  Real Osm_conc_CellWall;
+        //Real Osm_conc_Osmoreceptors;
         Physiolibrary.Types.RealIO.OsmolarityOutput
                                             OsmBody_Osm_conc_CellWalls      annotation (
             Placement(transformation(extent={{60,-20},{100,20}}), iconTransformation(
@@ -19110,11 +19058,12 @@
              ICFVActiveOsmoles  =  ICFVActiveElectrolytes + OsmCell_NonElectrolytes;
              ActiveOsmoles  =  ECFVActiveOsmoles + ICFVActiveOsmoles;
              OsmBody_Osm_conc_CellWalls  =  ActiveOsmoles / BodyH2O_Vol;
-             Osmoreceptors  = ActiveElectrolytes / BodyH2O_Vol; //, simplified=0.25331);
-             ICFV  =  ( ICFVActiveOsmoles / ActiveOsmoles)  * BodyH2O_Vol;
-             ECFV  =  BodyH2O_Vol - ICFV; // == ( ECFVActiveOsmoles / ActiveOsmoles)  * BodyH2O_Vol
-
-             ECFVOsmolarity = ECFVActiveOsmoles/ECFV; // == OsmBody_Osm_conc_CellWalls
+             Osmoreceptors  = ActiveElectrolytes / BodyH2O_Vol;
+//, simplified=0.25331);
+        ICFV = ICFVActiveOsmoles / ActiveOsmoles * BodyH2O_Vol;
+             ECFV  =  BodyH2O_Vol - ICFV;
+// == ( ECFVActiveOsmoles / ActiveOsmoles)  * BodyH2O_Vol
+        ECFVOsmolarity = ECFVActiveOsmoles / ECFV; // == OsmBody_Osm_conc_CellWalls
       annotation (
       Documentation(info="<html>
 <pre>QHP 2008 / OsmBody
@@ -19336,8 +19285,7 @@
           Placement(transformation(extent={{-120,-20},{-80,20}}),
             iconTransformation(extent={{-110,-10},{-90,10}})));
 
-      //parameter Real H2OTarget(final quantity="VolumeFlowRate",final displayUnit="ml/min") = 0;
-
+//parameter Real H2OTarget(final quantity="VolumeFlowRate",final displayUnit="ml/min") = 0;
       parameter Real H2OMassEffect[ :,3] = {{  0.0,  0.0,  0.0}, { 50.0,  1.0,  0.0}}
         "volume to outtake effect";
 
@@ -19433,17 +19381,16 @@
     Placement(transformation(extent={{-120,-60},{-80,-20}}),
     iconTransformation(extent={{-120,-60},{-80,-20}})));
     */
-      //parameter Physiolibrary.Types.Osmolarity Fiber_mass = 0.043;
-      //parameter Real Na_EqToAllConnectedOsm(final displayUnit="mOsm/mEq") = 2;
-      //parameter Real K_EqToAllConnectedOsm(final displayUnit="mOsm/mEq") = 2;
-      //parameter Real initialVolume(final quantity="Volume", final displayUnit="ml") = initialValue;
+      //parameter Physiolibrary.Types.Osmolarity Fiber_mass = 0.043;
+        //parameter Real Na_EqToAllConnectedOsm(final displayUnit="mOsm/mEq") = 2;
+        //parameter Real K_EqToAllConnectedOsm(final displayUnit="mOsm/mEq") = 2;
+        //parameter Real initialVolume(final quantity="Volume", final displayUnit="ml") = initialValue;
       parameter Physiolibrary.Types.Volume mass_start= 0.000949201;
       Physiolibrary.Types.Volume mass(start= mass_start)
         "water volume in gastro intestinal lumen";
       Physiolibrary.Types.Osmolarity OsmNa;
       Physiolibrary.Types.Osmolarity OsmK;
-      //Physiolibrary.Types.Osmolarity Fiber;
-
+      //Physiolibrary.Types.Osmolarity Fiber;
         Physiolibrary.Types.RealIO.VolumeOutput
                                               Vol
                                            annotation (Placement(transformation(
@@ -19453,18 +19400,16 @@
               transformation(extent={{120,60},{80,100}}), iconTransformation(extent={{
                   -100,-50},{-80,-30}})));
       initial equation
-        //mass = 949.201;
-      equation
-      //   der(mass) = (intake.q + absorbtion.q + outtake.q)/Library.SecPerMin;
-
-       //  env.pressure = Vol; //used in diarrea or vomitus calculation
-      //   OsmNa=Na_EqToAllConnectedOsm*GILumenSodium_Mass/mass;
-      //   OsmK = K_EqToAllConnectedOsm*GILumenPotassium_Mass/mass;
-         OsmNa=2*GILumenSodium/mass;
-         OsmK =2*GILumenPotassium/mass;
-
-      //   Fiber =Fiber_mass; ///mass;
-         absorbtion.o = (Fiber + OsmNa + OsmK);
+//mass = 949.201;
+      equation
+//   der(mass) = (intake.q + absorbtion.q + outtake.q)/Library.SecPerMin;
+//  env.pressure = Vol; //used in diarrea or vomitus calculation
+//   OsmNa=Na_EqToAllConnectedOsm*GILumenSodium_Mass/mass;
+//   OsmK = K_EqToAllConnectedOsm*GILumenPotassium_Mass/mass;
+        OsmNa = 2 * GILumenSodium / mass;
+         OsmK =2*GILumenPotassium/mass;
+//   Fiber =Fiber_mass; ///mass;
+        absorbtion.o = Fiber + OsmNa + OsmK;
 
          Vol = mass;
 
@@ -19548,12 +19493,11 @@
                       annotation (Placement(transformation(extent={{80,44},{100,
                 64}}), iconTransformation(extent={{90,-10},{110,10}})));
       parameter Physiolibrary.Types.Osmolarity Fiber = 0.043;
-      //parameter Real Na_EqToAllConnectedOsm(final displayUnit="mOsm/mEq") = 2;
-      //parameter Real K_EqToAllConnectedOsm(final displayUnit="mOsm/mEq") = 2;
-      //parameter Real initialVolume(final quantity="Volume", final displayUnit="ml") =  1000;
-
-      //    Na_EqToAllConnectedOsm=Na_EqToAllConnectedOsm,
-      //    K_EqToAllConnectedOsm=K_EqToAllConnectedOsm,
+      //parameter Real Na_EqToAllConnectedOsm(final displayUnit="mOsm/mEq") = 2;
+        //parameter Real K_EqToAllConnectedOsm(final displayUnit="mOsm/mEq") = 2;
+        //parameter Real initialVolume(final quantity="Volume", final displayUnit="ml") =  1000;
+        //    Na_EqToAllConnectedOsm=Na_EqToAllConnectedOsm,
+        //    K_EqToAllConnectedOsm=K_EqToAllConnectedOsm,
         Outtake vomitus
           annotation (Placement(transformation(extent={{-7,-7},{7,7}},
               rotation=180,
@@ -20096,8 +20040,7 @@
         import Physiomodel;
           extends Physiolibrary.Icons.Torso;
 
-      //    parameter Real interstitiumProteins = 2.6;
-
+//    parameter Real interstitiumProteins = 2.6;
           parameter Physiolibrary.Types.Volume InterstitialWater_start
         "2270,5670,3400 ml";
           parameter Physiolibrary.Types.Volume IntracellularWater_start
@@ -20131,8 +20074,8 @@
               extent={{-6,-6},{6,6}},
               origin={48,-82})));
 
-      //  Physiolibrary.Types.Volume volume;
-      //  Physiolibrary.Types.VolumeFlowRate change;
+//  Physiolibrary.Types.Volume volume;
+        //  Physiolibrary.Types.VolumeFlowRate change;
       Physiolibrary.Osmotic.Sources.SolventInflux metabolicH2O(useSolutionFlowInput=true)
           annotation (Placement(transformation(extent={{68,-98},{88,-78}})));
       Physiolibrary.Osmotic.Sensors.FlowMeasure flowMeasure1 annotation (
@@ -20230,9 +20173,8 @@
             points={{54.6,-82},{78,-82},{78,-81}},
             color={0,0,127},
             smooth=Smooth.None));
-      //  volume = extravascularH2O.WaterVolume;
-      //  change = extravascularH2O.q_out.q;
-
+//  volume = extravascularH2O.WaterVolume;
+//  change = extravascularH2O.q_out.q;
         connect(vascularH2O, capyMembrane.q_in) annotation (Line(
             points={{-82,-32},{-82,-14},{-60,-14}},
             color={127,127,0},
@@ -20624,7 +20566,7 @@
       end CerebrospinalFluid;
 
       model Bladder
-       // extends Library.PressureFlow.VolumeCompartement;
+       // extends Library.PressureFlow.VolumeCompartement;
         extends Physiolibrary.Icons.Bladder;
         Physiolibrary.Hydraulic.Components.ElasticVessel   volumeCompartement(
           stateName="BladderVolume.Mass", volume_start=0.0002)
@@ -20640,12 +20582,11 @@
             transformation(extent={{-100,69},{-80,89}}), iconTransformation(
               extent={{-100,-100},{-80,-80}})));
 
-      //  Real volume;
-      //  Real change;
+//  Real volume;
+      //  Real change;
       equation
-      //  volume = volumeCompartement.Volume;
-      //  change = volumeCompartement.con.q;
-
+//  volume = volumeCompartement.Volume;
+//  change = volumeCompartement.con.q;
       connect(busConnector.BladderVoidFlow, bladderVoidFlow.solutionFlow)
         annotation (Line(
           points={{-90,79},{-90,0},{-65.5,0},{-65.5,-10.25}},
@@ -20751,8 +20692,7 @@
         equation
           q_out.q + CD_H2O_Reab.q = 0;
           q_out.o = CD_H2O_Reab.o;
-
-        //  der(Inactive) = ((1/InactivateKinv) * CD_H2O_Reab.q - ReactivateK * Inactive) / Library.SecPerMin;
+//  der(Inactive) = ((1/InactivateKinv) * CD_H2O_Reab.q - ReactivateK * Inactive) / Library.SecPerMin;
           Active = 2 - Inactive;
 
         state = Inactive;
@@ -20944,9 +20884,7 @@
               points={{48,-8},{48,2}},
               color={0,0,127},
               smooth=Smooth.None));
-
-          //!!!
-
+//!!!
           connect(busConnector.DT_Na_Outflow, ADHEffect.yBase)       annotation (Line(
               points={{-92,86},{24,86},{24,62}},
               color={0,0,127},
@@ -21268,7 +21206,7 @@
     end Peritoneum_const;
 
     model Bladder_steady
-     // extends Library.PressureFlow.VolumeCompartement;
+     // extends Library.PressureFlow.VolumeCompartement;
       extends Physiolibrary.Icons.Bladder;
     Physiolibrary.Hydraulic.Interfaces.HydraulicPort_a con annotation (
         Placement(transformation(extent={{-84,18},{-44,58}}),
@@ -21343,7 +21281,7 @@
     end Bladder_steady;
 
     model Bladder_steady2
-     // extends Library.PressureFlow.VolumeCompartement;
+     // extends Library.PressureFlow.VolumeCompartement;
       extends Physiolibrary.Icons.Bladder;
     Physiolibrary.Osmotic.Interfaces.OsmoticPort_a     con annotation (
         Placement(transformation(extent={{-84,18},{-44,58}}),
@@ -22129,9 +22067,9 @@
             string="%second",
             index=1,
             extent={{5,2},{5,2}}));
-      //ifv=bone.FractIFV +brain.FractIFV +fat.FractIFV +GITract.FractIFV +kidney.FractIFV +leftHeart.FractIFV +liver.FractIFV +otherTissue.FractIFV +respiratoryMuscle.FractIFV +rightHeart.FractIFV +skin.FractIFV +skeletalMuscle.FractIFV;
-      //organ=bone.FractOrganH2O +brain.FractOrganH2O +fat.FractOrganH2O +GITract.FractOrganH2O +kidney.FractOrganH2O +leftHeart.FractOrganH2O +liver.FractOrganH2O +otherTissue.FractOrganH2O +respiratoryMuscle.FractOrganH2O +rightHeart.FractOrganH2O +skin.FractOrganH2O +skeletalMuscle.FractOrganH2O;
-      /*
+//ifv=bone.FractIFV +brain.FractIFV +fat.FractIFV +GITract.FractIFV +kidney.FractIFV +leftHeart.FractIFV +liver.FractIFV +otherTissue.FractIFV +respiratoryMuscle.FractIFV +rightHeart.FractIFV +skin.FractIFV +skeletalMuscle.FractIFV;
+//organ=bone.FractOrganH2O +brain.FractOrganH2O +fat.FractOrganH2O +GITract.FractOrganH2O +kidney.FractOrganH2O +leftHeart.FractOrganH2O +liver.FractOrganH2O +otherTissue.FractOrganH2O +respiratoryMuscle.FractOrganH2O +rightHeart.FractOrganH2O +skin.FractOrganH2O +skeletalMuscle.FractOrganH2O;
+/*
  assert(bone.FractIFV +
 brain.FractIFV +
 fat.FractIFV +
@@ -23572,8 +23510,7 @@
     model Water
       import QHP = Physiomodel;
       extends Physiolibrary.Icons.Water;
-    //  extends Physiomodel.Library.Utilities.DynamicState(stateName="BodyH2O.Vol", initType=Library.Utilities.Init.NoInit, STEADY=false);
-
+    //  extends Physiomodel.Library.Utilities.DynamicState(stateName="BodyH2O.Vol", initType=Library.Utilities.Init.NoInit, STEADY=false);
     Physiolibrary.Osmotic.Sources.SolventOutflux Hemorrhage(
         useSolutionFlowInput=true)
       annotation (Placement(transformation(extent={{16,47},{32,63}})));
@@ -23599,7 +23536,7 @@
       SweatFract=0.33,
       SkinFract=0.33)
       annotation (Placement(transformation(extent={{21,-31},{41,-11}})));
-    //  interstitiumProteins=3.3,
+    //  interstitiumProteins=3.3,
     QHP.Water.WaterCompartments.GI_Absorption GILumen
       annotation (Placement(transformation(extent={{-56,54},{-36,74}})));
     QHP.Water.WaterCompartments.Kidney.Kidney Kidney
@@ -23609,15 +23546,14 @@
       QHP.Water.WaterProperties waterProperties
         annotation (Placement(transformation(extent={{-80,-89},{-60,-69}})));
 
-    //  Real bodyH2O;
-    /*initial equation
-  if STEADY then
-     waterProperties.BodyH2O_Change.y = 0;
-  end if;
-*/
-
-    //initial equation
-    //   bodyH2O = waterProperties.BodyH2O.y;
+//  Real bodyH2O;
+      /*initial equation
+        if STEADY then
+           waterProperties.BodyH2O_Change.y = 0;
+        end if;
+      */
+  //initial equation
+      //   bodyH2O = waterProperties.BodyH2O.y;
     Physiolibrary.Osmotic.Components.OsmoticCell plasma(
         useImpermeableSolutesInput=true,
       NumberOfMembraneTypes=2,
@@ -23652,7 +23588,7 @@
       SweatFract=0.33,
       SkinFract=0.33)
       annotation (Placement(transformation(extent={{21,-90},{41,-70}})));
-    //  interstitiumProteins=2.2,
+    //  interstitiumProteins=2.2,
     QHP.Water.WaterCompartments.Peritoneum_const      peritoneum_const(
         initialVolume=1e-09)
       annotation (Placement(transformation(extent={{73,-16},{93,4}})));
@@ -23669,9 +23605,8 @@
     QHP.Water.WaterCompartments.LungEdema_const lungEdema_const
       annotation (Placement(transformation(extent={{72,14},{92,34}})));
     equation
-    //   changePerMin = waterProperties.BodyH2O_Change.y;
-    //   stateValue = bodyH2O;
-
+//   changePerMin = waterProperties.BodyH2O_Change.y;
+//   stateValue = bodyH2O;
     connect(IVDrip.solutionFlow, busConnector.IVDrip_H2ORate) annotation (Line(
         points={{24,34.6},{61,34.6},{61,90},{-89,90}},
         color={0,0,127},
@@ -24798,7 +24733,7 @@
     extends Physiolibrary.Icons.ProteinsLib;
 
     model Synthesis
-    //  parameter Physiolibrary.Types.MassFlowRate  SynthesisBasic "10 mg/min";
+    //  parameter Physiolibrary.Types.MassFlowRate  SynthesisBasic "10 mg/min";
       parameter Physiolibrary.Types.MolarFlowRate SynthesisBasic = 2.75753e-09
       "10 mg/min";
       parameter Real[:,3] data =  {{ 20.0,  3.0,  0.0}, { 28.0,  1.0,  -0.2}, { 40.0,  0.0,  0.0}}
@@ -24813,20 +24748,19 @@
           -10,-110; 10,-90], Placement(transformation(extent={{90,-10},{110,10}})));
 
       Physiolibrary.Types.Pressure COP;
-    //  Physiolibrary.Types.AmountOfSubstance  synthetizedAmount(start=0);
-    //  Physiolibrary.Types.Mass  synthetizedMass(start=0);
-    //protected
-    //  constant Physiolibrary.Types.Time sec=1;
-    //  constant Physiolibrary.Types.Volume ghostPlasmaVol=3.02e-3
-    //    "Strange dependence derived from original HumMod";
+    //  Physiolibrary.Types.AmountOfSubstance  synthetizedAmount(start=0);
+    //  Physiolibrary.Types.Mass  synthetizedMass(start=0);
+    //protected
+    //  constant Physiolibrary.Types.Time sec=1;
+    //  constant Physiolibrary.Types.Volume ghostPlasmaVol=3.02e-3
+    //    "Strange dependence derived from original HumMod";
     equation
       COP =  q_out.conc * Modelica.Constants.R * 310.15;
       c.u=COP;
       q_out.q = -SynthesisBasic * c.val;
-
-    //TODO: state
-    //der(synthetizedAmount) = -q_out.q;
-    //  ProteinsMass2AmountOfSubstance(synthetizedMass,ghostPlasmaVol) = synthetizedAmount;
+//TODO: state
+//der(synthetizedAmount) = -q_out.q;
+//  ProteinsMass2AmountOfSubstance(synthetizedMass,ghostPlasmaVol) = synthetizedAmount;
      annotation (
         defaultComponentName="synthesis",
         Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{
@@ -24844,9 +24778,9 @@
     end Synthesis;
 
     model Degradation
-    //  parameter Physiolibrary.Types.MassFlowRate  DegradationBasic "10 mg/min";
-    //  parameter Real[:,3] data =  {{ 0.00,  0.0,  0.0}, { 0.07,  1.0,  40.0}, { 0.09,  6.0,  0.0}}
-    //    "ProteinEffect";
+    //  parameter Physiolibrary.Types.MassFlowRate  DegradationBasic "10 mg/min";
+      //  parameter Real[:,3] data =  {{ 0.00,  0.0,  0.0}, { 0.07,  1.0,  40.0}, { 0.09,  6.0,  0.0}}
+      //    "ProteinEffect";
        parameter Physiolibrary.Types.MolarFlowRate DegradationBasic = 2.75753e-09
       "10 mg/min";
        parameter Real[:,3] data =  {{ 0.00,  0.0,  0.0}, { 1.45,  1.0,  1.59}, { 1.97,  6.0,  0.0}}
@@ -24860,14 +24794,14 @@
           transformation(extent={{-100,0},{-60,40}}), iconTransformation(extent=
              {{-110,-10},{-90,10}})));
 
-    //  Physiolibrary.Types.AmountOfSubstance  degradedAmount(start=0);
-    //  Physiolibrary.Types.Mass  degradedMass(start=0);
-    //protected
-    //  constant Physiolibrary.Types.Time sec=1;
-    //  constant Physiolibrary.Types.Volume ghostPlasmaVol=3.02e-3
-    //    "Strange dependence derived from original HumMod";
+//  Physiolibrary.Types.AmountOfSubstance  degradedAmount(start=0);
+    //  Physiolibrary.Types.Mass  degradedMass(start=0);
+    //protected
+    //  constant Physiolibrary.Types.Time sec=1;
+    //  constant Physiolibrary.Types.Volume ghostPlasmaVol=3.02e-3
+    //    "Strange dependence derived from original HumMod";
     equation
-    //  ProteinsMassConcentration2Concentration(c.u*1000) = q_in.conc;
+//  ProteinsMassConcentration2Concentration(c.u*1000) = q_in.conc;
       c.u = q_in.conc;
       q_in.q = DegradationBasic * c.val;
     //  q_in.q =ProteinsMass2AmountOfSubstance(DegradationBasic*c.val*sec,ghostPlasmaVol)/sec;
@@ -24935,10 +24869,9 @@
       albumin = totalProteins * (0.63/1.45);
       nonAlbuminMolarConc = totalProteins - albumin;
       nonAlbumin = nonAlbuminMM * nonAlbuminMolarConc;
-
-    // inversion of totalProteins=(320*101325/760)/(310.15*8.314) *0.001*tProtMassConc + (1160*101325/760)/(310.15*8.314)* (0.001*tProtMassConc)^2;
-    //  tProtMassConc = 0.0000170159 * (-8.106e6 + 63.6632 * ((1.6212e10 + 1.4208e10 * totalProteins)^0.5));
-    // linear aproximation at point totalProteins = 1.45 mmol/l :
+// inversion of totalProteins=(320*101325/760)/(310.15*8.314) *0.001*tProtMassConc + (1160*101325/760)/(310.15*8.314)* (0.001*tProtMassConc)^2;
+//  tProtMassConc = 0.0000170159 * (-8.106e6 + 63.6632 * ((1.6212e10 + 1.4208e10 * totalProteins)^0.5));
+// linear aproximation at point totalProteins = 1.45 mmol/l :
       nonAlbuminMM = 34.16-10*(totalProteins-1.45);
 
     end ProteinDivision;
@@ -25616,9 +25549,9 @@
   package Metabolism "Body Nutrients, Metabolism and Heat Systems"
     extends Physiolibrary.Icons.NutrientsMetabolismLib;
     model LiverMetabolism
-     // import QHP = Physiomodel;
+     // import QHP = Physiomodel;
       extends Physiolibrary.Icons.Liver;
-      //outer parameter Real EFC_Vol(final displayUnit="ml");
+      //outer parameter Real EFC_Vol(final displayUnit="ml");
     Physiolibrary.Chemical.Components.Substance Glycogen(solute_start=120e-6/
           Substances.Glucose.mw)
       "amount of bound glucose molecules in glycogen (initial mass 120 mg of bound glucose molecules)"
@@ -26310,7 +26243,7 @@
 
     model Glucose
     extends Physiolibrary.Icons.Glucose;
-      //outer parameter Real EFC_Vol(final displayUnit="ml");
+      //outer parameter Real EFC_Vol(final displayUnit="ml");
     Physiolibrary.Chemical.Components.Substance GlucosePool(
       stateName="GlucosePool.Mass",
       useNormalizedVolume=false,
@@ -26955,7 +26888,7 @@
 
     model Lipids
      extends Physiolibrary.Icons.Lipids;
-      //outer parameter Real EFC_Vol(final displayUnit="ml");
+      //outer parameter Real EFC_Vol(final displayUnit="ml");
     Physiolibrary.Chemical.Components.Substance LipidDepositsFA(stateName=
           "LipidDeposits.Mass", solute_start=12.0324/Substances.FattyAcids.mw)
       "amount of fatty acids stored as lipid deposits (initial 12.0324 kg)"
@@ -27307,7 +27240,7 @@
 
     model Lactate
       extends Physiolibrary.Icons.Lactate;
-      //outer parameter Real EFC_Vol(final displayUnit="ml");
+      //outer parameter Real EFC_Vol(final displayUnit="ml");
     Physiolibrary.Chemical.Interfaces.ChemicalPort_b Lactate(q(final
           displayUnit="mEq/min"), conc(
         final displayUnit="mEq/ml",
@@ -27396,7 +27329,7 @@
 
     model AminoAcids
       extends Physiolibrary.Icons.AminoAcids;
-      //outer parameter Real EFC_Vol(final displayUnit="ml");
+      //outer parameter Real EFC_Vol(final displayUnit="ml");
     Physiolibrary.Chemical.Interfaces.ChemicalPort_b AminoAcids(conc(final
           displayUnit="mg/ml"), q(final displayUnit="mg/min"))
       "extracellular storage" annotation (Placement(transformation(extent={{80,34},
@@ -27523,15 +27456,15 @@
       parameter Boolean canBurnFattyAcids = true;
 
       parameter Physiolibrary.Types.MolarEnergy glucoseEnergy = (1/0.2439e-6)*4.1864*Substances.Glucose.mw
-      "Metabolism-Tools.CarboAerobic(mg/cal)=0.2439";   // 1/(kg/cal)*(J/cal)*(kg/mol) = J/mol
+      "Metabolism-Tools.CarboAerobic(mg/cal)=0.2439";         // 1/(kg/cal)*(J/cal)*(kg/mol) = J/mol
       parameter Physiolibrary.Types.MolarEnergy fattyAcidsEnergy = (1/0.1075e-6)*4.1864*Substances.FattyAcids.mw
       "Metabolism-Tools.Fat(mg/cal)=0.1075";
       parameter Physiolibrary.Types.MolarEnergy lactateEnergy = (1/0.2538e-6)*4.1864*Substances.Lactate.mw
       "Metabolism-Tools.Lac-(mg/cal)=0.2438";
       parameter Physiolibrary.Types.MolarEnergy ketoAcidsEnergy = (1/0.1075e-6)*4.1864*Substances.KetoAcids.mw
       "Metabolism-Tools.Fat(mg/cal)=0.1075";
-      parameter Physiolibrary.Types.MolarEnergy oxygenEnergy = (1/0.2093)*4.1864*22710.95322615; // 22710.95322615 ml/mol of oxygen at 0 degC
-
+      parameter Physiolibrary.Types.MolarEnergy oxygenEnergy = (1/0.2093)*4.1864*22710.95322615; 
+// 22710.95322615 ml/mol of oxygen at 0 degC
       parameter Physiolibrary.Types.MolarEnergy glucoseAnaerobicEnergy = glucoseEnergy - lactateEnergy;
       parameter Physiolibrary.Types.MolarEnergy glycogenAnaerobicEnergy = glucoseAnaerobicEnergy;
     /*
@@ -27576,8 +27509,8 @@
       parameter Real[:,3] LacFractionData
       "fraction of oxygen to be use for lactate metabolism (depends on lactate concentration)";
 
-    //  parameter Real[:,3] PO2OnAerobicFractionData
-    //    "Aerobic Fraction of O2 tissue use depents on pO2";
+//  parameter Real[:,3] PO2OnAerobicFractionData
+      //    "Aerobic Fraction of O2 tissue use depents on pO2";
       parameter Real[:,3] PO2OnAerobicFractionData = {{2,0,0},{10,1,0}}
       "Aerobic Fraction of O2 tissue use depents on pO2";
 
@@ -27590,12 +27523,12 @@
           origin={-10,52})));
     Physiolibrary.Chemical.Interfaces.ChemicalPort_a lactate(q(nominal=1e-6))
       annotation (Placement(transformation(extent={{46,47},{66,67}}),
-          iconTransformation(extent={{-76,90},{-56,110}}))); //(q(final displayUnit="mEq/min"), conc(final displayUnit="mEq/ml")) "in mEq/ml"
-
+          iconTransformation(extent={{-76,90},{-56,110}}))); 
+//(q(final displayUnit="mEq/min"), conc(final displayUnit="mEq/ml")) "in mEq/ml"
         Physiolibrary.Chemical.Interfaces.ChemicalPort_a   glucose(q(nominal=1e-6))
       annotation (Placement(transformation(extent={{45,-4},{65,16}}),
-          iconTransformation(extent={{-110,70},{-90,90}})));       //(q(final displayUnit="mg/min"), conc(final displayUnit="mg/ml")) "in mg/ml"
-
+          iconTransformation(extent={{-110,70},{-90,90}})));       
+//(q(final displayUnit="mg/min"), conc(final displayUnit="mg/ml")) "in mg/ml"
       Physiolibrary.Types.RealIO.MolarFlowRateOutput
                                             Tissue_CO2FromMetabolism
                                                               annotation (
@@ -27632,15 +27565,15 @@
                                iconTransformation(
             extent={{-11.4284,-11.4285},{28.5715,28.5715}},
             origin={-104.572,-48.5715})));
-    //  Real O2Use;
+    //  Real O2Use;
       Physiolibrary.Types.MolarFlowRate O2UseByGlu,O2UseByLac,O2UseByFA, O2UseByKA;
       Physiolibrary.Types.Fraction FAfraction, KAfraction, Ratio;
       Physiolibrary.Types.Power AnaerobicCals;
 
     Physiolibrary.Chemical.Interfaces.ChemicalPort_a fattyAcids
       annotation (Placement(transformation(extent={{45,-60},{65,-40}}),
-          iconTransformation(extent={{-110,-10},{-90,10}})));  //(q(final displayUnit="mg/min"), conc(final displayUnit="mg/ml")) "in mg/ml"
-
+          iconTransformation(extent={{-110,-10},{-90,10}})));  
+//(q(final displayUnit="mg/min"), conc(final displayUnit="mg/ml")) "in mg/ml"
     Physiolibrary.Chemical.Interfaces.ChemicalPort_a glycogen "glycogen flow"
       annotation (Placement(transformation(extent={{4,-50},{26,-28}}),
           iconTransformation(extent={{-110,30},{-90,50}})));
@@ -27662,72 +27595,61 @@
       annotation (Placement(transformation(extent={{67,-40},{87,-20}}),
           iconTransformation(extent={{-38,90},{-18,110}})));  //(q(final displayUnit="mg/min"), conc(final displayUnit="mg/ml")) "in mg/ml"
 
-     Modelica.SIunits.Power gluW=glucose.q*glucoseEnergy, gluO2W=O2UseByGlu*oxygenEnergy, lacW=lactate.q*lactateEnergy, lacO2W=LacFraction.val * CalsUse, anaerobicGluW=glucoseAnaerobicEnergy *(glucose.q - (O2UseByGlu*oxygenEnergy)/glucoseEnergy), anaerobicGlyW=glycogenAnaerobicEnergy*glycogen.q;
-      Modelica.SIunits.MolarFlowRate anaerobicGluGly=((glucose.q - (O2UseByGlu*oxygenEnergy)/glucoseEnergy) + glycogen.q), anaerobicProducedLac=(lactate.q - LacFraction.val * CalsUse/lactateEnergy);
+     Modelica.Units.SI.Power gluW=glucose.q*glucoseEnergy, gluO2W=O2UseByGlu*oxygenEnergy, lacW=lactate.q*lactateEnergy, lacO2W=LacFraction.val * CalsUse, anaerobicGluW=glucoseAnaerobicEnergy *(glucose.q - (O2UseByGlu*oxygenEnergy)/glucoseEnergy), anaerobicGlyW=glycogenAnaerobicEnergy*glycogen.q;
+      Modelica.Units.SI.MolarFlowRate anaerobicGluGly=((glucose.q - (O2UseByGlu*oxygenEnergy)/glucoseEnergy) + glycogen.q), anaerobicProducedLac=(lactate.q - LacFraction.val * CalsUse/lactateEnergy);
     equation
      AerobicFraction.u = pO2;
-     LacFraction.u = lactate.conc; // * lacDensity * 100.0; //  [mg/dl]
-     O2Use*oxygenEnergy = AerobicFraction.val * CalsUse; //O2Use = AerobicFraction.val * eTOo2_coef * CalsUse;
-     O2UseByLac = LacFraction.val * O2Use;
-
-     Tissue_MetabolicH2ORate = (O2Use/2)*Substances.Water.mw / WaterDensity;
-
-     if canBurnFattyAcids then
-       ketoAcids.q=0;
-       KAfraction=0;
-       O2UseByKA=0;
-
-       O2UseByFA  = FAfraction    * O2Use;
-       O2UseByGlu + O2UseByLac + O2UseByFA = O2Use;
-       FAfraction = (1-LacFraction.val)*(Ratio/(Ratio+0.026*(Substances.Glucose.mw/Substances.FattyAcids.mw)));
-       Ratio = (fattyAcids.conc) / (glucose.conc); // Ratio = fattyAcids.conc / glucose.conc;
-
-       //Tissue_CO2FromMetabolism = 0.0446 * (O2UseByGlu*RQglu + O2UseByLac*RQlac + O2UseByFA*RQfat);
-       Tissue_CO2FromMetabolism = (O2UseByGlu*RQglu + O2UseByLac*RQlac + O2UseByFA*RQfat);
-
-      // Tissue_MetabolicH2ORate = 0.000176 * CalsUse;
-      // Tissue_MetabolicH2ORate = (0.176e-9/4.1864) * CalsUse; // 0.000176 ml/cal = 0.176e-9/4.1864 m3/J
-
-       fattyAcids.q*fattyAcidsEnergy = FAfraction * CalsUse;
-     else
-       fattyAcids.q=0;
-       FAfraction=0;
-       O2UseByFA=0;
-
-       O2UseByKA  = KAfraction    * O2Use;
-       O2UseByGlu + O2UseByLac + O2UseByKA = O2Use;
-       KAfraction = (1-LacFraction.val)*(Ratio/(Ratio+0.222*(Substances.Glucose.mw/Substances.KetoAcids.mw)));
-       Ratio = (ketoAcids.conc) / (glucose.conc);
-
-       Tissue_CO2FromMetabolism = (O2UseByGlu*RQglu + O2UseByLac*RQlac + O2UseByKA*RQketo);
-       //Tissue_MetabolicH2ORate = (0.176e-9/4186.4) * CalsUse; // 0.000176 ml/cal = 0.176e-9/4186.4 m3/J
-
-       ketoAcids.q*ketoAcidsEnergy = KAfraction * CalsUse;
-     end if;
-
-     GlycogenAvailabilityCurve.u = glycogen.conc;
-
-      if AerobicFraction.val<1-Modelica.Constants.eps then
-          // with anaerobic metabolism
-        AnaerobicCals = (1-AerobicFraction.val)*CalsUse; //anaerobic callories
-
-        glycogen.q = GlycogenAvailabilityCurve.val * AnaerobicCals;
-
-       // anaerobic_glu2energy *(glucose.q - (O2UseByGlu/eTOo2_coef) * eTOglu_coef) + gly2energy*glycogen.q = AnaerobicCals;
-       // (glucose.q - (O2UseByGlu/eTOo2_coef) * eTOglu_coef) + gly2lac*glycogen.q = (lactate.q*lacDensity - LacFraction.val * CalsUse * eTOlac_coef);
-
-       glucoseAnaerobicEnergy *(glucose.q - (O2UseByGlu*oxygenEnergy)/glucoseEnergy) + glycogenAnaerobicEnergy*glycogen.q = AnaerobicCals;
-
-       ((glucose.q - (O2UseByGlu*oxygenEnergy)/glucoseEnergy) + glycogen.q) = -2*(lactate.q - LacFraction.val * CalsUse/lactateEnergy);
-
-      else
-          // only aerobic metabolism
-       AnaerobicCals = 0.0;
-       glycogen.q = 0.0;
-       lactate.q*lactateEnergy = LacFraction.val * CalsUse;
-       glucose.q*glucoseEnergy = O2UseByGlu*oxygenEnergy;
+     LacFraction.u = lactate.conc;
+// * lacDensity * 100.0; //  [mg/dl]
+      O2Use * oxygenEnergy = AerobicFraction.val * CalsUse;
+//O2Use = AerobicFraction.val * eTOo2_coef * CalsUse;
+      O2UseByLac = LacFraction.val * O2Use;
+
+     Tissue_MetabolicH2ORate = (O2Use/2)*Substances.Water.mw / WaterDensity;
+  if canBurnFattyAcids then
+        ketoAcids.q = 0;
+        KAfraction = 0;
+        O2UseByKA = 0;
+        O2UseByFA = FAfraction * O2Use;
+        O2UseByGlu + O2UseByLac + O2UseByFA = O2Use;
+        FAfraction = (1 - LacFraction.val) * (Ratio / (Ratio + 0.026 * (Substances.Glucose.mw / Substances.FattyAcids.mw)));
+        Ratio = fattyAcids.conc / glucose.conc;
+// Ratio = fattyAcids.conc / glucose.conc;
+//Tissue_CO2FromMetabolism = 0.0446 * (O2UseByGlu*RQglu + O2UseByLac*RQlac + O2UseByFA*RQfat);
+        Tissue_CO2FromMetabolism = O2UseByGlu * RQglu + O2UseByLac * RQlac + O2UseByFA * RQfat;
+// Tissue_MetabolicH2ORate = 0.000176 * CalsUse;
+// Tissue_MetabolicH2ORate = (0.176e-9/4.1864) * CalsUse; // 0.000176 ml/cal = 0.176e-9/4.1864 m3/J
+        fattyAcids.q * fattyAcidsEnergy = FAfraction * CalsUse;
+      else
+        fattyAcids.q = 0;
+        FAfraction = 0;
+        O2UseByFA = 0;
+        O2UseByKA = KAfraction * O2Use;
+        O2UseByGlu + O2UseByLac + O2UseByKA = O2Use;
+        KAfraction = (1 - LacFraction.val) * (Ratio / (Ratio + 0.222 * (Substances.Glucose.mw / Substances.KetoAcids.mw)));
+        Ratio = ketoAcids.conc / glucose.conc;
+        Tissue_CO2FromMetabolism = O2UseByGlu * RQglu + O2UseByLac * RQlac + O2UseByKA * RQketo;
+//Tissue_MetabolicH2ORate = (0.176e-9/4186.4) * CalsUse; // 0.000176 ml/cal = 0.176e-9/4186.4 m3/J
+        ketoAcids.q * ketoAcidsEnergy = KAfraction * CalsUse;
       end if;
 
+     GlycogenAvailabilityCurve.u = glycogen.conc;
+  if AerobicFraction.val < 1 - Modelica.Constants.eps then
+// with anaerobic metabolism
+        AnaerobicCals = (1 - AerobicFraction.val) * CalsUse;
+//anaerobic callories
+        glycogen.q = GlycogenAvailabilityCurve.val * AnaerobicCals;
+// anaerobic_glu2energy *(glucose.q - (O2UseByGlu/eTOo2_coef) * eTOglu_coef) + gly2energy*glycogen.q = AnaerobicCals;
+// (glucose.q - (O2UseByGlu/eTOo2_coef) * eTOglu_coef) + gly2lac*glycogen.q = (lactate.q*lacDensity - LacFraction.val * CalsUse * eTOlac_coef);
+        glucoseAnaerobicEnergy * (glucose.q - O2UseByGlu * oxygenEnergy / glucoseEnergy) + glycogenAnaerobicEnergy * glycogen.q = AnaerobicCals;
+        glucose.q - O2UseByGlu * oxygenEnergy / glucoseEnergy + glycogen.q = -2 * (lactate.q - LacFraction.val * CalsUse / lactateEnergy);
+      else
+// only aerobic metabolism
+        AnaerobicCals = 0.0;
+        glycogen.q = 0.0;
+        lactate.q * lactateEnergy = LacFraction.val * CalsUse;
+        glucose.q * glucoseEnergy = O2UseByGlu * oxygenEnergy;
+      end if;
       annotation (        Documentation(revisions="<html>
 
 <table cellspacing=\"2\" cellpadding=\"0\" border=\"0\"><tr>
@@ -28068,19 +27990,18 @@
       partial model TissueMetabolismBase
       extends Physiolibrary.Icons.MetabolismPart;
 
-        parameter Physiolibrary.Types.AmountOfSubstance initialTissueO2(displayUnit="ml_STP")=1.7612646902879852858386051702718e-4; //pO2*solubility*LiquidVolume
-      //  parameter Physiolibrary.Types.GasSolubility O2solubility(final displayUnit="ml/mmHg"); //=0.00003;
-      //  parameter Real O2fromBloodtoTissueConductance(final displayUnit="ml/(min.mmHg)")=1000000;
-
+        parameter Physiolibrary.Types.AmountOfSubstance initialTissueO2(displayUnit="ml_STP")=1.7612646902879852858386051702718e-4;       //pO2*solubility*LiquidVolume
+        //  parameter Physiolibrary.Types.GasSolubility O2solubility(final displayUnit="ml/mmHg"); //=0.00003;
+        //  parameter Real O2fromBloodtoTissueConductance(final displayUnit="ml/(min.mmHg)")=1000000;
         parameter Physiolibrary.Types.AmountOfSubstance initialLactateMass(displayUnit="mEq") = 0;
 
         parameter Real NormalCalsUsed
         "basal energy per kilogram of tissue [cal/min]";
 
         parameter Physiolibrary.Types.PowerPerMass BasalCalsUsed
-        "basal energy per kilogram of tissue";            //= NormalCalsUsed*(4.1864/60)
-
-                                                                                       //BasalCalsUsedPerKG(final displayUnit="kcal/min")
+        "basal energy per kilogram of tissue";            
+//= NormalCalsUsed*(4.1864/60)
+        //BasalCalsUsedPerKG(final displayUnit="kcal/min")
         parameter Physiolibrary.Types.Mass TissueSize "mass of tissue";
 
         parameter Physiolibrary.Types.VolumeFlowRate DC(displayUnit="(mEq/min)/(mEq/ml)");
@@ -28242,8 +28163,7 @@
         Physiolibrary.Types.Constants.MassConst size(k=TissueSize)
           annotation (Placement(transformation(extent={{98,90},{90,98}})));
       initial equation
-       // BasalCalsUsedPerKG = NormalCalsUsed*(4186.4/60)/mass;
-
+// BasalCalsUsedPerKG = NormalCalsUsed*(4186.4/60)/mass;
       equation
         connect(Thyroid.y,HeatMetabolism_Skin. yBase)       annotation (Line(
             points={{70,80},{70,82}},
@@ -28460,13 +28380,13 @@
             HeatMetabolism_Skin(data={{10.0+273.15,0.0,0},{37.1+273.15,1.0,0.12},{40.0+273.15,1.5,0},
                 {46.0+273.15,0.0,0}}),
           PartCaloriesUse(nin=4));
-       //   Lactate(stateName="SkeletalMuscle-Lactate.Mass"),
+       //   Lactate(stateName="SkeletalMuscle-Lactate.Mass"),
         extends Physiolibrary.Icons.SkeletalMuscle;
 
       Physiolibrary.Chemical.Interfaces.ChemicalPort_a fattyAcids
              annotation (
           Placement(transformation(extent={{-103,-78},{-83,-58}}),
-            iconTransformation(extent={{90,-70},{110,-50}})));   //(conc(final displayUnit="mg/ml"), q(final displayUnit="mg/min"))
+            iconTransformation(extent={{90,-70},{110,-50}})));           //(conc(final displayUnit="mg/ml"), q(final displayUnit="mg/min"))
         Physiomodel.Metabolism.CellularMetabolism
                                  cellularMetabolism(
                                               LacFractionData={{10,0,0},{100,0.3,0}},
@@ -28722,7 +28642,7 @@
         extends Physiomodel.Metabolism.TissueMetabolism.TissueMetabolismBase(
             TotalCaloriesUse(nin=4), HeatMetabolism_Skin(data={{10.0+273.15,0.0,0},{
                 37.1+273.15,1.0,0.12},{40.0+273.15,1.5,0},{46.0+273.15,0.0,0}}));
-      //    ,Lactate(stateName="RespiratoryMuscle-Lactate.Mass")
+      //    ,Lactate(stateName="RespiratoryMuscle-Lactate.Mass")
         extends Physiolibrary.Icons.RespiratoryMuscle;
 
       Physiolibrary.Types.Constants.HeatFlowRateConst Shivering_Cals(k=0)
@@ -28766,7 +28686,7 @@
       Physiolibrary.Chemical.Interfaces.ChemicalPort_a fattyAcids
              annotation (
           Placement(transformation(extent={{-101,-78},{-81,-58}}),
-            iconTransformation(extent={{90,-70},{110,-50}})));   //(conc(final  displayUnit="mg/ml"), q(final displayUnit="mg/min"))
+            iconTransformation(extent={{90,-70},{110,-50}})));           //(conc(final  displayUnit="mg/ml"), q(final displayUnit="mg/min"))
         Physiomodel.Metabolism.CellularMetabolism
                                  cellularMetabolism(
                                               LacFractionData={{10,0,0},{100,0.3,0}},
@@ -28971,7 +28891,7 @@
 
       model Brain
         extends Physiomodel.Metabolism.TissueMetabolism.TissueMetabolismBase;
-      //  (Lactate(     stateName="Brain-Lactate.Mass"));
+      //  (Lactate(     stateName="Brain-Lactate.Mass"));
         extends Physiolibrary.Icons.Brain;
         Physiomodel.Metabolism.CellularMetabolism
                                 cellularMetabolism(
@@ -29088,7 +29008,8 @@
 
       model Kidney
         extends Physiomodel.Metabolism.TissueMetabolism.TissueMetabolism(
-            TotalCaloriesUse(nin=4));//, Lactate(stateName="Kidney-Lactate.Mass"));
+            TotalCaloriesUse(nin=4));
+  //, Lactate(stateName="Kidney-Lactate.Mass"));
         extends Physiolibrary.Icons.Kidney;
 
         Physiolibrary.Types.RealIO.MolarFlowRateInput PT_Na_Reab( displayUnit="mmol/min")
@@ -29157,13 +29078,14 @@
       end HeartMuscle;
 
       model GITract
-        extends TissueMetabolismBase;//(Lactate(stateName="GITract-Lactate.Mass"));
+        extends TissueMetabolismBase;
+  //(Lactate(stateName="GITract-Lactate.Mass"));
         extends Physiolibrary.Icons.GITract;
 
       Physiolibrary.Chemical.Interfaces.ChemicalPort_a fattyAcids
              annotation (
           Placement(transformation(extent={{-103,-80},{-83,-60}}),
-            iconTransformation(extent={{90,-70},{110,-50}})));   //(conc(final displayUnit="mg/ml"), q(final displayUnit="mg/min"))
+            iconTransformation(extent={{90,-70},{110,-50}})));           //(conc(final displayUnit="mg/ml"), q(final displayUnit="mg/min"))
         Physiomodel.Metabolism.CellularMetabolism
                            cellularMetabolism(LacFractionData={{10,0,0},{100,0.3,0}},
           PO2OnAerobicFractionData=PO2OnAerobicFractionData)
@@ -29313,24 +29235,25 @@
       end GITract;
 
       model Liver
-        extends TissueMetabolismBase;//(Lactate(stateName="Liver-Lactate.Mass"));
+        extends TissueMetabolismBase;
+  //(Lactate(stateName="Liver-Lactate.Mass"));
         extends Physiolibrary.Icons.Liver;
       Physiolibrary.Chemical.Interfaces.ChemicalPort_a fattyAcids
              annotation (
           Placement(transformation(extent={{-103,-80},{-83,-60}}),
-            iconTransformation(extent={{90,-70},{110,-50}})));   //(conc(final displayUnit="mg/ml"), q(final displayUnit="mg/min"))
+            iconTransformation(extent={{90,-70},{110,-50}})));           //(conc(final displayUnit="mg/ml"), q(final displayUnit="mg/min"))
         Physiomodel.Metabolism.CellularMetabolism
                            cellularMetabolism(LacFractionData={{10,0,0},{100,0.3,0}},
         PO2OnAerobicFractionData=PO2OnAerobicFractionData,
         Ratio(start=0.087))
           annotation (Placement(transformation(extent={{62,-76},{92,-46}})));
-         // glucose(conc(start=1.43)),
+         // glucose(conc(start=1.43)),
         NutrientDelivery_Fat fattyAcidsDelivery
           annotation (Placement(transformation(extent={{-74,-80},{-54,-60}})));
-                                               //(neededFlow(q(start=125.166135276543)))
+                                               //(neededFlow(q(start=125.166135276543)))
         NutrientDelivery_2 glucoseDelivery
           annotation (Placement(transformation(extent={{-72,-44},{-52,-24}})));
-                                          //(delivery(start=991.319))
+                                          //(delivery(start=991.319))
       Physiolibrary.Chemical.Interfaces.ChemicalPort_a GILumenCarbohydrates
         annotation (Placement(transformation(extent={{-96,-58},{-76,-38}}),
             iconTransformation(extent={{-30,90},{-10,110}})));
@@ -29540,22 +29463,25 @@
       model Skin
         extends TissueMetabolism(HeatMetabolism_Skin(data={{10.0+273.15,0.0,0},{29.5+273.15,
                 1.0,0.12},{40.0+273.15,1.5,0},{46.0+273.15,0.0,0}}));
-                                 //(Lactate(stateName="Skin-Lactate.Mass"));
+                                 //(Lactate(stateName="Skin-Lactate.Mass"));
         extends Physiolibrary.Icons.Skin;
       end Skin;
 
       model Bone
-        extends TissueMetabolism;//(Lactate(stateName="Bone-Lactate.Mass"));
+        extends TissueMetabolism;
+  //(Lactate(stateName="Bone-Lactate.Mass"));
         extends Physiolibrary.Icons.Bone;
       end Bone;
 
       model Fat
-        extends TissueMetabolism;//(Lactate(stateName="Fat-Lactate.Mass"));
+        extends TissueMetabolism;
+  //(Lactate(stateName="Fat-Lactate.Mass"));
         extends Physiolibrary.Icons.Fat;
       end Fat;
 
       model OtherTissue
-        extends TissueMetabolism;//(Lactate(stateName="OtherTissue-Lactate.Mass"));
+        extends TissueMetabolism;
+  //(Lactate(stateName="OtherTissue-Lactate.Mass"));
         extends Physiolibrary.Icons.OtherTissue;
       end OtherTissue;
 
@@ -29569,7 +29495,7 @@
           TissueSize=8.558,
           DC(displayUnit="ml/min") = 3e-06)
           annotation (Placement(transformation(extent={{66,88},{40,114}})));
-        //initialLactateMass=3.00477
+        //initialLactateMass=3.00477
         Physiomodel.Metabolism.TissueMetabolism.Brain brain(
           PO2OnAerobicFractionData={{2.0,0.0,0},{20.0,1.0,0}},
           NormalCalsUsed=193.709,
@@ -29577,7 +29503,7 @@
           BasalCalsUsed=11.492766,
           TissueSize=1.1572)
           annotation (Placement(transformation(extent={{-60,86},{-32,114}})));
-          //initialLactateMass=0.850703,
+          //initialLactateMass=0.850703,
         Physiomodel.Metabolism.TissueMetabolism.Fat fat(
           NormalCalsUsed=29.9658,
           initialTissueO2(displayUnit="ml_STP") = 0.00096297146941496,
@@ -29585,8 +29511,7 @@
           TissueSize=16.6,
           DC(displayUnit="ml/min") = 4.5e-06)
           annotation (Placement(transformation(extent={{66,-54},{40,-28}})));
-      //   initialLactateMass=2.73208,
-
+      //   initialLactateMass=2.73208,
         Physiomodel.Metabolism.TissueMetabolism.GITract gITract(
           NormalCalsUsed=92.7945,
           initialTissueO2(displayUnit="ml_STP") = 8.0401733111647e-05,
@@ -29594,7 +29519,7 @@
           TissueSize=1.2716,
           DC(displayUnit="ml/min") = 3e-06)
           annotation (Placement(transformation(extent={{66,-22},{40,4}})));
-      //    initialLactateMass=0.934802)
+      //    initialLactateMass=0.934802)
         Physiomodel.Metabolism.TissueMetabolism.Kidney kidney(
           PO2OnAerobicFractionData={{2.0,0.0,0},{20.0,1.0,0}},
           NormalCalsUsed=36.8312,
@@ -29603,7 +29528,7 @@
           BasalCalsUsed=9.90876,
           TissueSize=0.2552)
           annotation (Placement(transformation(extent={{66,10},{40,36}})));
-      //    initialLactateMass=0.187607)
+      //    initialLactateMass=0.187607)
         Physiomodel.Metabolism.TissueMetabolism.Liver liver(
           PO2OnAerobicFractionData={{2.0,0.0,0},{10.0,1.0,0}},
           NormalCalsUsed=147.338,
@@ -29612,7 +29537,7 @@
           TissueSize=1.5422,
           DC(displayUnit="ml/min") = 1.6666666666667e-06)
           annotation (Placement(transformation(extent={{66,44},{40,70}})));
-       //   initialLactateMass=1.13373)
+       //   initialLactateMass=1.13373)
         Physiomodel.Metabolism.TissueMetabolism.OtherTissue otherTissue(
           NormalCalsUsed=39.1075,
           initialTissueO2(displayUnit="ml_STP") = 0.00022235966714886,
@@ -29620,7 +29545,7 @@
           BasalCalsUsed=0.739668,
           TissueSize=3.63)
           annotation (Placement(transformation(extent={{66,-88},{40,-62}})));
-      //    initialLactateMass=2.66855)
+      //    initialLactateMass=2.66855)
         Physiomodel.Metabolism.TissueMetabolism.RespiratoryMuscle respiratoryMuscle(
           NormalCalsUsed=6.27882,
         DC(displayUnit="ml/min") = 4.5e-06,
@@ -29628,7 +29553,7 @@
           BasalCalsUsed=0.13956,
           TissueSize=3.08)
           annotation (Placement(transformation(extent={{-60,52},{-32,80}})));
-      //    initialLactateMass=2.66976)
+      //    initialLactateMass=2.66976)
         Physiomodel.Metabolism.TissueMetabolism.RightHeartMuscle rightHeart(
           NormalCalsUsed=2.34779,
         DC(displayUnit="ml/min") = 5e-08,
@@ -29638,8 +29563,8 @@
           BasalCalsUsed=4.1868,
           TissueSize=0.0385)
           annotation (Placement(transformation(extent={{-60,14},{-32,42}})));
-      //    ,Lactate(stateName="RightHeart-Lactate.Mass")
-      //    initialLactateMass=2.8e-002,
+      //    ,Lactate(stateName="RightHeart-Lactate.Mass")
+        //    initialLactateMass=2.8e-002,
         Physiomodel.Metabolism.TissueMetabolism.LeftHeartMuscle leftHeart(
           DC=18,
           NormalCalsUsed=15.7067,
@@ -29649,8 +29574,8 @@
           MotionCals(displayUnit="cal/min") = 1.67472,
           HeatCals(displayUnit="cal/min") = 6.07086)
           annotation (Placement(transformation(extent={{-58,-20},{-30,8}})));
-      //    ,Lactate(stateName="LeftHeart-Lactate.Mass")
-      //    initialLactateMass=0.169817,
+      //    ,Lactate(stateName="LeftHeart-Lactate.Mass")
+        //    initialLactateMass=0.169817,
         Physiomodel.Metabolism.TissueMetabolism.SkeletalMuscleMetabolism skeletalMuscle(
           PO2OnAerobicFractionData={{0.0,0.0,0},{15.0,0.2,0.04},{20.0,1.0,0}},
           NormalCalsUsed=145.228,
@@ -29659,7 +29584,7 @@
           BasalCalsUsed=0.362856,
           TissueSize=27.4)
           annotation (Placement(transformation(extent={{-58,-58},{-30,-30}})));
-      //    initialLactateMass=23.7503)
+      //    initialLactateMass=23.7503)
         Physiomodel.Metabolism.TissueMetabolism.Skin skin(
           PO2OnAerobicFractionData={{2.0,0.0,0},{20.0,1.0,0}},
           HeatMetabolism_Skin(data={{10.0+273.15,0.0,0},{29.5+273.15,1.0,0.12},{40.0+273.15,1.5,0},{
@@ -29670,30 +29595,31 @@
           BasalCalsUsed=0.955986,
           TissueSize=2.244)
           annotation (Placement(transformation(extent={{-60,-96},{-32,-68}})));
-      //    initialLactateMass=1.64965)
+      //    initialLactateMass=1.64965)
       Physiolibrary.Chemical.Interfaces.ChemicalPort_a glucose
              annotation (
           Placement(transformation(extent={{-12,2},{8,22}}), iconTransformation(
-              extent={{90,-20},{110,0}})));                   //(conc(final displayUnit="mg/ml"), q(final displayUnit="mg/min"))
+              extent={{90,-20},{110,0}})));                           //(conc(final displayUnit="mg/ml"), q(final displayUnit="mg/min"))
       Physiolibrary.Chemical.Interfaces.ChemicalPort_a fattyAcids
              annotation (
           Placement(transformation(extent={{-10,-16},{10,4}}),
-            iconTransformation(extent={{90,70},{110,90}})));     //(conc(final       displayUnit="mg/ml"), q(final displayUnit="mg/min"))
+            iconTransformation(extent={{90,70},{110,90}})));             //(conc(final       displayUnit="mg/ml"), q(final displayUnit="mg/min"))
       Physiolibrary.Chemical.Interfaces.ChemicalPort_a ketoAcids
              annotation (
           Placement(transformation(extent={{-10,76},{10,96}}),
-            iconTransformation(extent={{90,20},{110,40}})));    //(conc(final     displayUnit="mg/ml"), q(final displayUnit="mg/min"))
+            iconTransformation(extent={{90,20},{110,40}})));            //(conc(final     displayUnit="mg/ml"), q(final displayUnit="mg/min"))
       Physiolibrary.Types.BusConnector busConnector annotation (Placement(
             transformation(extent={{-92,106},{-72,126}}), iconTransformation(
               extent={{-92,80},{-72,100}})));
               Physiolibrary.Chemical.Interfaces.ChemicalPort_a GILumenCarbohydrates
         annotation (Placement(transformation(extent={{70,72},{90,92}}),
             iconTransformation(extent={{-70,-110},{-50,-90}})));
-              //(    conc(final displayUnit="mg/ml"), q(final displayUnit="mg/min"))
+              //(    conc(final displayUnit="mg/ml"), q(final displayUnit="mg/min"))
       Physiolibrary.Chemical.Interfaces.ChemicalPort_a lactate
              annotation (
           Placement(transformation(extent={{-10,56},{10,76}}),
-            iconTransformation(extent={{90,-70},{110,-50}})));//(conc(final       displayUnit="mEq/ml"), q(final displayUnit="mEq/min"))
+            iconTransformation(extent={{90,-70},{110,-50}})));
+  //(conc(final       displayUnit="mEq/ml"), q(final displayUnit="mEq/min"))
         Modelica.Blocks.Math.Feedback Heat annotation (Placement(transformation(
               extent={{-5,-5},{5,5}},
               rotation=180,
@@ -31598,17 +31524,17 @@
               origin={-80,60})));
 
         Physiolibrary.Types.MolarFlowRate consumption;
-      //  Real fromGILumen_conc;
-        Physiolibrary.Types.MolarFlowRate delivery; //(start=300);
-
-      equation
-      //  delivered.conc  = neededFlow.conc + concChange;
-        if ( -neededFlow.q > delivery) then
-          consumption = delivery;
-          FuelFractUseDelay = consumption/(-neededFlow.q);
-        else
-          consumption + neededFlow.q = 0;
-          FuelFractUseDelay = 1;
+      //  Real fromGILumen_conc;
+        Physiolibrary.Types.MolarFlowRate delivery; 
+//(start=300);
+      equation
+//  delivered.conc  = neededFlow.conc + concChange;
+        if (-neededFlow.q) > delivery then
+          consumption = delivery;
+          FuelFractUseDelay = consumption / (-neededFlow.q);
+        else
+          consumption + neededFlow.q = 0;
+          FuelFractUseDelay = 1;
         end if;
         delivery = q_in.q + fromGILumen.q + GITUsed;
 
@@ -31616,12 +31542,10 @@
 
         neededFlow.conc * solventFlow = - q_out.q;
 
-        q_in.q = q_in.conc * solventFlow;
-
-      //calculation of glucose concentration in gartro intestinal tract:  fromGILumen.conc
+        q_in.q = q_in.conc * solventFlow;
+//calculation of glucose concentration in gartro intestinal tract:  fromGILumen.conc
         q_in.conc = fromGILumen.conc;
-      //  fromGILumen.q + q_in.conc * (solventFlow-HepaticArty) + GITUsed = fromGILumen.conc * (solventFlow-HepaticArty);
-
+//  fromGILumen.q + q_in.conc * (solventFlow-HepaticArty) + GITUsed = fromGILumen.conc * (solventFlow-HepaticArty);
        annotation (
           Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{
                   100,100}}), graphics={
@@ -31654,7 +31578,7 @@
           BasalCalsUsed=0.6126684,
           TissueSize=8.558)
           annotation (Placement(transformation(extent={{66,88},{40,114}})));
-        //initialLactateMass=3.00477
+        //initialLactateMass=3.00477
         Physiomodel.Metabolism.TissueMetabolism.Brain brain(
           PO2OnAerobicFractionData={{2.0,0.0,0},{20.0,1.0,0}},
           NormalCalsUsed=193.709,
@@ -31662,7 +31586,7 @@
           BasalCalsUsed=12.4431696,
           TissueSize=1.1572)
           annotation (Placement(transformation(extent={{-60,86},{-32,114}})));
-          //initialLactateMass=0.850703,
+          //initialLactateMass=0.850703,
         Physiomodel.Metabolism.TissueMetabolism.Fat fat(
           NormalCalsUsed=29.9658,
           initialTissueO2(displayUnit="ml_STP") = 0.00096297146941496,
@@ -31670,8 +31594,7 @@
           BasalCalsUsed=0.136071,
           TissueSize=16.6)
           annotation (Placement(transformation(extent={{66,-54},{40,-28}})));
-      //   initialLactateMass=2.73208,
-
+      //   initialLactateMass=2.73208,
         Physiomodel.Metabolism.TissueMetabolism.GITract gITract(
           NormalCalsUsed=92.7945,
           initialTissueO2(displayUnit="ml_STP") = 8.0401733111647e-05,
@@ -31679,7 +31602,7 @@
           BasalCalsUsed=5.4191148,
           TissueSize=1.2716)
           annotation (Placement(transformation(extent={{66,-22},{40,4}})));
-      //    initialLactateMass=0.934802)
+      //    initialLactateMass=0.934802)
         Physiomodel.Metabolism.TissueMetabolism.Kidney kidney(
           PO2OnAerobicFractionData={{2.0,0.0,0},{20.0,1.0,0}},
           NormalCalsUsed=36.8312,
@@ -31688,7 +31611,7 @@
           BasalCalsUsed=11.40903,
           TissueSize=0.2552)
           annotation (Placement(transformation(extent={{66,10},{40,36}})));
-      //    initialLactateMass=0.187607)
+      //    initialLactateMass=0.187607)
         Physiomodel.Metabolism.TissueMetabolism.Liver liver(
           PO2OnAerobicFractionData={{2.0,0.0,0},{10.0,1.0,0}},
           NormalCalsUsed=147.338,
@@ -31697,7 +31620,7 @@
           BasalCalsUsed=7.1357028,
           TissueSize=1.5422)
           annotation (Placement(transformation(extent={{66,44},{40,70}})));
-       //   initialLactateMass=1.13373)
+       //   initialLactateMass=1.13373)
         Physiomodel.Metabolism.TissueMetabolism.OtherTissue otherTissue(
           NormalCalsUsed=39.1075,
           initialTissueO2(displayUnit="ml_STP") = 0.00022235966714886,
@@ -31705,7 +31628,7 @@
           BasalCalsUsed=0.7933986,
           TissueSize=3.63)
           annotation (Placement(transformation(extent={{66,-88},{40,-62}})));
-      //    initialLactateMass=2.66855)
+      //    initialLactateMass=2.66855)
         Physiomodel.Metabolism.TissueMetabolism.RespiratoryMuscle respiratoryMuscle(
           NormalCalsUsed=6.27882,
         DC(displayUnit="ml/min") = 4.5e-06,
@@ -31713,7 +31636,7 @@
           BasalCalsUsed=0.1584006,
           TissueSize=3.08)
           annotation (Placement(transformation(extent={{-60,52},{-32,80}})));
-      //    initialLactateMass=2.66976)
+      //    initialLactateMass=2.66976)
         Physiomodel.Metabolism.TissueMetabolism.RightHeartMuscle rightHeart(
           NormalCalsUsed=2.34779,
         DC(displayUnit="ml/min") = 5e-08,
@@ -31723,8 +31646,8 @@
           BasalCalsUsed=5.5398342,
           TissueSize=0.0385)
           annotation (Placement(transformation(extent={{-60,14},{-32,42}})));
-      //    ,Lactate(stateName="RightHeart-Lactate.Mass")
-      //    initialLactateMass=2.8e-002,
+      //    ,Lactate(stateName="RightHeart-Lactate.Mass")
+        //    initialLactateMass=2.8e-002,
         Physiomodel.Metabolism.TissueMetabolism.LeftHeartMuscle leftHeart(
           DC=18,
           NormalCalsUsed=15.7067,
@@ -31734,8 +31657,8 @@
           BasalCalsUsed=6.0959808,
           TissueSize=0.231)
           annotation (Placement(transformation(extent={{-58,-20},{-30,8}})));
-      //    ,Lactate(stateName="LeftHeart-Lactate.Mass")
-      //    initialLactateMass=0.169817,
+      //    ,Lactate(stateName="LeftHeart-Lactate.Mass")
+        //    initialLactateMass=0.169817,
         Physiomodel.Metabolism.TissueMetabolism.SkeletalMuscleMetabolism skeletalMuscle(
           PO2OnAerobicFractionData={{0.0,0.0,0},{15.0,0.2,0.04},{20.0,1.0,0}},
           NormalCalsUsed=145.228,
@@ -31744,7 +31667,7 @@
           BasalCalsUsed=0.411702,
           TissueSize=27.4)
           annotation (Placement(transformation(extent={{-58,-58},{-30,-30}})));
-      //    initialLactateMass=23.7503)
+      //    initialLactateMass=23.7503)
         Physiomodel.Metabolism.TissueMetabolism.Skin skin(
           PO2OnAerobicFractionData={{2.0,0.0,0},{20.0,1.0,0}},
           HeatMetabolism_Skin(data={{10.0+273.15,0.0,0},{29.5+273.15,1.0,0.12},{40.0+273.15,1.5,0},{
@@ -31755,30 +31678,31 @@
           BasalCalsUsed=0.9622662,
           TissueSize=2.244)
           annotation (Placement(transformation(extent={{-60,-96},{-32,-68}})));
-      //    initialLactateMass=1.64965)
+      //    initialLactateMass=1.64965)
       Physiolibrary.Chemical.Interfaces.ChemicalPort_a glucose
              annotation (
           Placement(transformation(extent={{-12,2},{8,22}}), iconTransformation(
-              extent={{90,-20},{110,0}})));                   //(conc(final displayUnit="mg/ml"), q(final displayUnit="mg/min"))
+              extent={{90,-20},{110,0}})));                           //(conc(final displayUnit="mg/ml"), q(final displayUnit="mg/min"))
       Physiolibrary.Chemical.Interfaces.ChemicalPort_a fattyAcids
              annotation (
           Placement(transformation(extent={{-10,-16},{10,4}}),
-            iconTransformation(extent={{90,70},{110,90}})));     //(conc(final       displayUnit="mg/ml"), q(final displayUnit="mg/min"))
+            iconTransformation(extent={{90,70},{110,90}})));             //(conc(final       displayUnit="mg/ml"), q(final displayUnit="mg/min"))
       Physiolibrary.Chemical.Interfaces.ChemicalPort_a ketoAcids
              annotation (
           Placement(transformation(extent={{-10,76},{10,96}}),
-            iconTransformation(extent={{90,20},{110,40}})));    //(conc(final     displayUnit="mg/ml"), q(final displayUnit="mg/min"))
+            iconTransformation(extent={{90,20},{110,40}})));            //(conc(final     displayUnit="mg/ml"), q(final displayUnit="mg/min"))
       Physiolibrary.Types.BusConnector busConnector annotation (Placement(
             transformation(extent={{-92,106},{-72,126}}), iconTransformation(
               extent={{-92,80},{-72,100}})));
               Physiolibrary.Chemical.Interfaces.ChemicalPort_a GILumenCarbohydrates
         annotation (Placement(transformation(extent={{70,72},{90,92}}),
             iconTransformation(extent={{-70,-110},{-50,-90}})));
-              //(    conc(final displayUnit="mg/ml"), q(final displayUnit="mg/min"))
+              //(    conc(final displayUnit="mg/ml"), q(final displayUnit="mg/min"))
       Physiolibrary.Chemical.Interfaces.ChemicalPort_a lactate
              annotation (
           Placement(transformation(extent={{-10,56},{10,76}}),
-            iconTransformation(extent={{90,-70},{110,-50}})));//(conc(final       displayUnit="mEq/ml"), q(final displayUnit="mEq/min"))
+            iconTransformation(extent={{90,-70},{110,-50}})));
+  //(conc(final       displayUnit="mEq/ml"), q(final displayUnit="mEq/min"))
         Modelica.Blocks.Math.Feedback Heat annotation (Placement(transformation(
               extent={{-5,-5},{5,5}},
               rotation=180,
@@ -33352,7 +33276,7 @@
       Physiomodel.Metabolism.TissueMetabolism.Metabolism
                                              tissuesMetabolism
         annotation (Placement(transformation(extent={{90,-6},{50,34}})));
-                                                              //(glucose(conc(start=1.05)))
+                                                              //(glucose(conc(start=1.05)))
     Physiolibrary.Types.BusConnector busConnector annotation (Placement(
           transformation(extent={{60,60},{100,100}}), iconTransformation(extent=
              {{60,60},{100,100}})));
@@ -33605,9 +33529,9 @@
       T.MolarFlowRate brain_O2Use(varName="Brain-Flow.O2Use", storeUnit="ml_STP/min")
         "Brain oxygen consumption. "
       annotation (Placement(transformation(extent={{-36,70},{-30,76}})));
-      //T.Fraction BrainFuel_FractUseDelay(varName="Brain-Fuel.FractUseDelay")
-      //    "Brain deficiency of nutrients needed by cells metabolism. "
-      //annotation (Placement(transformation(extent={{-36,80},{-30,86}})));
+      //T.Fraction BrainFuel_FractUseDelay(varName="Brain-Fuel.FractUseDelay")
+          //    "Brain deficiency of nutrients needed by cells metabolism. "
+          //annotation (Placement(transformation(extent={{-36,80},{-30,86}})));
       T.Fraction brain_Fuel_FractUseDelay(varName="Brain-Fuel.FractUseDelay")
         "Brain deficiency of nutrients needed by cells metabolism. "
       annotation (Placement(transformation(extent={{-36,90},{-30,96}})));
@@ -33659,9 +33583,9 @@
       T.Concentration Glucose(varName="GlucosePool.[Glucose(mG/dL)]", storeUnit="mg/dl", unitConversions = Substances.Glucose.unitConversions)
         "Extracellular glucose concentration."
       annotation (Placement(transformation(extent={{-36,260},{-30,266}})));
-      //Variable KA_Change(varName="KAPool.Change")
-      //    "Change of keto-acids extracellular mass."
-      //annotation (Placement(transformation(extent={{-34,270},{-28,276}})));
+      //Variable KA_Change(varName="KAPool.Change")
+          //    "Change of keto-acids extracellular mass."
+          //annotation (Placement(transformation(extent={{-34,270},{-28,276}})));
       T.AmountOfSubstance KAPool_Osmoles(varName="KAPool.Osmoles", storeUnit="mosm")
         "Keto-acids extracellular osmoles."
       annotation (Placement(transformation(extent={{-36,280},{-30,286}})));
@@ -33876,7 +33800,7 @@
         "Triiodothyronine  and thyroxine effect to metabolism."
         annotation (Placement(transformation(extent={{-82,4},{-76,10}})));
 
-        ////to debug:
+////to debug:
       T.Concentration FAPool(varName="FAPool.[FA(mMol/L)]")
         "Fatty-acids extracellular concentration."
           annotation (Placement(transformation(extent={{-100,-42},{-94,-36}})));
@@ -34937,9 +34861,9 @@
     end IO_Bus;
 
     model LiverMetabolism2
-     // import QHP = Physiomodel;
+     // import QHP = Physiomodel;
       extends Physiolibrary.Icons.Liver;
-      //outer parameter Real EFC_Vol(final displayUnit="ml");
+      //outer parameter Real EFC_Vol(final displayUnit="ml");
     Physiolibrary.Chemical.Components.Substance Glycogen(solute_start=120e-6/
           Substances.Glucose.mw)
       "amount of bound glucose molecules in glycogen (initial mass 120 mg of bound glucose molecules)"
@@ -35706,14 +35630,14 @@
             extent=[-10,-110; 10,-90], Placement(transformation(extent={{90,20},{
                   110,40}}), iconTransformation(extent={{90,20},{110,40}})));
 
-        parameter Modelica.SIunits.StoichiometricNumber a=1
+        parameter Modelica.Units.SI.StoichiometricNumber a=1
         "Stoichiometric number of solute A";
-        parameter Modelica.SIunits.StoichiometricNumber b=1
+        parameter Modelica.Units.SI.StoichiometricNumber b=1
         "Stoichiometric number of solute B";
 
       equation
          a*A.q + b*B.q = 0;
-         a*A.conc = b*B.conc;  // sound strange, dissociation constand should be here
+         a*A.conc = b*B.conc;  // sound strange, dissociation constand should be here
        annotation (
           Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{
                   100,100}}), graphics={
@@ -35762,10 +35686,9 @@
               rotation=270,
               origin={60,40})));
 
-       // parameter Modelica.SIunits.StoichiometricNumber a_in=1 "Stoichiometric number of solute A";
-       // parameter Modelica.SIunits.StoichiometricNumber a_out=1 "Stoichiometric number of solute B";
-       // parameter Modelica.SIunits.StoichiometricNumber a_out2=1 "Stoichiometric number of solute C";
-
+// parameter Modelica.SIunits.StoichiometricNumber a_in=1 "Stoichiometric number of solute A";
+        // parameter Modelica.SIunits.StoichiometricNumber a_out=1 "Stoichiometric number of solute B";
+        // parameter Modelica.SIunits.StoichiometricNumber a_out2=1 "Stoichiometric number of solute C";
       equation
         q_out.q + coef*q_in.q = 0;
         q_out2.q + coef2*q_in.q = 0;
@@ -35867,8 +35790,7 @@
 
     model Insulin
       extends Physiolibrary.Icons.Pancreas;
-    // outer parameter Real ECF_Vol(final displayUnit="ml");
-
+    // outer parameter Real ECF_Vol(final displayUnit="ml");
     Insulin_Physiolibrary.Chemical.Components.Substance InsulinPool(
       stateName="InsulinPool.Mass",
       useNormalizedVolume=false,
@@ -36099,8 +36021,7 @@
 
     model Glucagon
      extends Physiolibrary.Icons.Pancreas;
-     // outer parameter Real ECF_Vol(final displayUnit="ml");
-
+     // outer parameter Real ECF_Vol(final displayUnit="ml");
       Modelica.Blocks.Math.Gain gain(k=0.05/60)
         annotation (Placement(transformation(extent={{-44,-32},{-38,-26}})));
     Physiolibrary.Chemical.Sources.UnlimitedSolutePumpOut clearance(
@@ -36264,8 +36185,7 @@
 
     model ADH
       extends Physiolibrary.Icons.Hypophysis;
-    // outer parameter Real ECF_Vol(final displayUnit="ml");
-
+    // outer parameter Real ECF_Vol(final displayUnit="ml");
       constant Physiolibrary.Types.Volume NormalMedullaVolume = 31e-6
       "Normal kidney medulla volume (31ml)";
       constant Physiolibrary.Types.Volume NormalECFVolume = 14.3610097207699e-3
@@ -36548,7 +36468,7 @@
          annotation (Placement(
           transformation(
           extent={{-10,-10},{10,10}},
-          origin={-44,-2})));                                               //(toAnotherUnitCoef=1000, unitsString="pmol/l")
+          origin={-44,-2})));                                                     //(toAnotherUnitCoef=1000, unitsString="pmol/l")
     Physiolibrary.Chemical.Sources.UnlimitedSolutePumpOut Degradation(
         useSoluteFlowInput=true)
       annotation (Placement(transformation(extent={{0,-68},{20,-48}})));
@@ -36668,8 +36588,7 @@
 
     model ANP
       extends Physiolibrary.Icons.Heart;
-    // outer parameter Real ECF_Vol(final displayUnit="ml");
-
+    // outer parameter Real ECF_Vol(final displayUnit="ml");
     Physiolibrary.Chemical.Components.Substance ANPPool(
       stateName="ANPPool.Mass",
       useNormalizedVolume=false,
@@ -36892,16 +36811,14 @@
 
     model EPO
       extends Physiolibrary.Icons.Kidney;
-    // outer parameter Real ECF_Vol(final displayUnit="ml");
-
+    // outer parameter Real ECF_Vol(final displayUnit="ml");
     EPO_Physiolibrary.Chemical.Components.Substance EPOPool(
       stateName="EPOPool.Mass",
       useNormalizedVolume=false,
       solute_start=(20e3*14361.0097207699*0.4)*1e-6)
       "default = 20 iu/l = 20e3 iu/m3 "
       annotation (Placement(transformation(extent={{-50,-54},{-30,-34}})));
-      //NominalSolute=Substances.Erythropoietin.molpIU
-
+      //NominalSolute=Substances.Erythropoietin.molpIU
     EPO_Physiolibrary.Chemical.Sources.UnlimitedSolutePump secretion(
         useSoluteFlowInput=true)
       annotation (Placement(transformation(extent={{76,-54},{56,-34}})));
@@ -36917,7 +36834,7 @@
          annotation (Placement(
           transformation(
           extent={{-10,-10},{10,10}},
-          origin={-38,-32})));                                              //(toAnotherUnitCoef=1000, unitsString="U/l")
+          origin={-38,-32})));                                                    //(toAnotherUnitCoef=1000, unitsString="U/l")
     EPO_Physiolibrary.Chemical.Sources.UnlimitedSolutePumpOut Clearance(
         useSoluteFlowInput=true)
       annotation (Placement(transformation(extent={{-30,-98},{-10,-78}})));
@@ -37055,8 +36972,7 @@
 
     model Thyroxine
      extends Physiolibrary.Icons.ThyroidGland;
-    // outer parameter Real ECF_Vol(final displayUnit="ml");
-
+    // outer parameter Real ECF_Vol(final displayUnit="ml");
     Physiolibrary.Chemical.Components.Substance ThyroidPool(
       stateName="ThyroidPool.Mass",
       useNormalizedVolume=false,
@@ -37172,8 +37088,7 @@
 
     model Thyrotropin
       extends Physiolibrary.Icons.Hypophysis;
-    // outer parameter Real ECF_Vol(final displayUnit="ml");
-
+    // outer parameter Real ECF_Vol(final displayUnit="ml");
     TSH_Physiolibrary.Types.Constants.ConcentrationConst hormoneConstant(k=4)
       "4 uU/ml"
       annotation (Placement(transformation(extent={{-8,30},{-20,42}})));
@@ -37256,8 +37171,7 @@
 
     model Renin
       extends Physiolibrary.Icons.Kidney;
-    // outer parameter Real ECF_Vol(final displayUnit="ml");
-
+    // outer parameter Real ECF_Vol(final displayUnit="ml");
     Renin_Physiolibrary.Chemical.Components.Substance ReninPool(
       stateName="ReninPool.Mass",
       useNormalizedVolume=false,
@@ -37279,7 +37193,7 @@
       Renin_Physiolibrary.Chemical.Sensors.ConcentrationMeasure concentrationMeasure
        annotation (Placement(transformation(
           extent={{-10,-10},{10,10}},
-          origin={-62,-32})));                                                //(unitsString="GU/ml")
+          origin={-62,-32})));                                                      //(unitsString="GU/ml")
     Renin_Physiolibrary.Chemical.Sources.UnlimitedSolutePumpOut Clearance(
         useSoluteFlowInput=true)
       annotation (Placement(transformation(extent={{-30,-98},{-10,-78}})));
@@ -37649,12 +37563,11 @@
     end Renin;
 
     model Angiotensine2
-    //  extends Library.Interfaces.Tissues.Liver;
-    //  extends Library.Interfaces.Tissues.Kidney;
+    //  extends Library.Interfaces.Tissues.Liver;
+      //  extends Library.Interfaces.Tissues.Kidney;
       extends Physiolibrary.Icons.Lungs;
 
-    // outer parameter Real ECF_Vol(final displayUnit="ml");
-
+// outer parameter Real ECF_Vol(final displayUnit="ml");
     Physiolibrary.Blocks.Factors.Normalization A2 annotation (Placement(transformation(extent={{-2,-2},{18,18}})));
     Physiolibrary.Types.Constants.ConcentrationConst A2CONC(k=0.3333e-9/
           Substances.AngiotensinII.mw) "0.3333 pg/ml = 0.3333*1e-15/1e-6 kg/m3"
@@ -37724,8 +37637,7 @@
 
   model Leptin
      extends Physiolibrary.Icons.Fat;
-     // outer parameter Real ECF_Vol(final displayUnit="ml");
-
+     // outer parameter Real ECF_Vol(final displayUnit="ml");
       Modelica.Blocks.Math.Gain gain(                        y(unit="mol/s"), k(unit=
             "1/s") = 0.01/60)
         annotation (Placement(transformation(extent={{-44,-32},{-38,-26}})));
@@ -37908,7 +37820,7 @@
         "initial pool of PT gland";
 
       initial equation
-      //  PT_pool = initialPT;
+//  PT_pool = initialPT;
         der( PT_pool) = 0;
       equation
         der( PT_pool)   = (1-PT_pool)*0.01*(0.85*T64m+0.15) - PT_pool*0.01*(0.85*T64p+0.15);
@@ -38095,11 +38007,11 @@
               iconTransformation(extent={{60,-20},{100,20}})));
 
       initial equation
-        //One_alpha_OH = 126;
+//One_alpha_OH = 126;
         der( One_alpha_OH)  = 0;
       equation
         der( One_alpha_OH)  = 6.3*H(PTH, 1.90371, 1.549,0.1112)*( if PO4<=16.8/14 then 1 else H_minus(PO4,1.525,1.302,8.252,-1.78249))  -0.05 *One_alpha_OH;
-        //H7,9:alpha was calculated,
+//H7,9:alpha was calculated,
       end One_alpha_OH;
       One_alpha_OH one_alpha_OH
         annotation (Placement(transformation(extent={{-26,16},{-6,36}})));
@@ -38203,8 +38115,7 @@
 
       model Epinephrine
         extends Physiolibrary.Icons.AdrenalGland;
-      // outer parameter Real ECF_Vol(final displayUnit="ml");
-
+      // outer parameter Real ECF_Vol(final displayUnit="ml");
       Physiolibrary.Chemical.Components.Substance EpiPool(
         stateName="EpiPool.Mass",
         useNormalizedVolume=false,
@@ -38306,8 +38217,7 @@
 
       model Norepinephrine
         extends Physiolibrary.Icons.AdrenalGland;
-      // outer parameter Real ECF_Vol(final displayUnit="ml");
-
+      // outer parameter Real ECF_Vol(final displayUnit="ml");
       Physiolibrary.Chemical.Components.Substance NEPool(
         stateName="NEPool.Mass",
         useNormalizedVolume=false,
@@ -39157,19 +39067,19 @@
       model OvarianCycle
 
         Modelica.StateGraph.InitialStepWithSignal FOLLICULAR(
-                                                   nIn=3)
+                                                   nOut = 1, nIn = 3)
           annotation (Placement(transformation(extent={{-94,18},{-74,38}})));
         Modelica.StateGraph.TransitionWithSignal Follicle
           annotation (Placement(transformation(extent={{-68,38},{-48,18}})));
         Modelica.StateGraph.StepWithSignal OVULATORY(
-                                           nOut=2)
+                                           nIn = 1, nOut = 2)
           annotation (Placement(transformation(extent={{-42,18},{-22,38}})));
         Modelica.StateGraph.TransitionWithSignal Ovulation
           annotation (Placement(transformation(extent={{-10,38},{10,18}})));
         Modelica.StateGraph.StepWithSignal LUTEAL(
-                                        nOut=2)
+                                        nIn = 1, nOut = 2)
           annotation (Placement(transformation(extent={{16,18},{36,38}})));
-        Modelica.StateGraph.StepWithSignal IDLE
+        Modelica.StateGraph.StepWithSignal IDLE(nIn = 1, nOut = 1) 
           annotation (Placement(transformation(extent={{74,18},{94,38}})));
         Modelica.StateGraph.TransitionWithSignal CorpusLuteum
           annotation (Placement(transformation(extent={{48,38},{68,18}})));
@@ -39576,8 +39486,7 @@
       end Progesterone;
 
       model LH
-                                             //Library.Interfaces.Tissues.Hypothalamus;
-
+                                             //Library.Interfaces.Tissues.Hypothalamus;
       Physiolibrary.Chemical.Components.Substance LH_Circulating_Mass(
         q_out(conc(final displayUnit="IU/ml"), q(final displayUnit="IU/min")),
         stateName="LH-Circulating.Mass",
@@ -40611,10 +40520,9 @@
       T.Fraction BetaPool_Effect(varName="BetaPool.Effect")
         "Humoral and neural effect on beta receptor stimulation."
       annotation (Placement(transformation(extent={{-40,38},{-34,44}})));
-      //Variable NephronADH_conc(varName="NephronADH.[ADH]")
-      //    "Nephron vasopresine concentration. [ng/l]"
-      //annotation (Placement(transformation(extent={{-36,170},{-30,176}})));
-
+      //Variable NephronADH_conc(varName="NephronADH.[ADH]")
+          //    "Nephron vasopresine concentration. [ng/l]"
+          //annotation (Placement(transformation(extent={{-36,170},{-30,176}})));
       T.Concentration Epinephrine(varName="EpiPool.[Epi(nMol/L)]", storeUnit=
             "nmol/l") "Epinephrine extracelular concentration."
         annotation (Placement(transformation(extent={{-40,-28},{-34,-22}})));
@@ -40889,14 +40797,14 @@
       redeclare model extends Variables
         extends Physiolibrary.Icons.Hormones;
 
-      //Variable NephronADH_conc(varName="NephronADH.[ADH]")
-      //    "Nephron vasopresine concentration. [ng/l]"
-      //annotation (Placement(transformation(extent={{-36,170},{-30,176}})));
-
+//Variable NephronADH_conc(varName="NephronADH.[ADH]")
+          //    "Nephron vasopresine concentration. [ng/l]"
+          //annotation (Placement(transformation(extent={{-36,170},{-30,176}})));
       T.Concentration EPOPool(
         varName="EPOPool.[EPO]", storeUnit="iu/l")
         "Erythropoetin concentration."
-        annotation (Placement(transformation(extent={{-40,48},{-34,54}})));
+        annotation (Placement(transformation(extent={{-40,48},{-34,54}})));
+
       equation
 
         connect(EPOPool.y, busConnector.Erythropoietin) annotation (Line(
@@ -41116,23 +41024,20 @@
         import Modelica.Math;
 
         Physiolibrary.Types.Concentration betaX "buffer value of blood";
-                                               //(unit = "mEq/l")
+                                               //(unit = "mEq/l")
         Physiolibrary.Types.Concentration betaP "buffer value of plasma";
-                                               //(unit = "mEq/l")
-
+                                               //(unit = "mEq/l")
         Physiolibrary.Types.Concentration _cTH
         "total concentration of tiratable hydrogen ions";
-                                             //( displayUnit="mEq/l")
+                                             //( displayUnit="mEq/l")
         Physiolibrary.Types.Concentration _BE "base excess";
-                                            //( displayUnit="mEq/l")
-
+                                            //( displayUnit="mEq/l")
         Physiolibrary.Types.Concentration _BEox
         "base excess in fully oxygenated blood";
-                                              //( displayUnit="mEq/l")
+                                              //( displayUnit="mEq/l")
         Physiolibrary.Types.Concentration _cTHox
         "total concentration of tiratable hydrogen ions in fully oxygenated blood";
-                                               //( displayUnit="mEq/l")
-
+                                               //( displayUnit="mEq/l")
          Physiolibrary.Types.RealIO.pHOutput pH( start=7.4) "plasma pH"    annotation (Placement(transformation(
                 extent={{30,-98},{70,-58}}), iconTransformation(
               extent={{-20,-20},{20,20}},
@@ -41190,26 +41095,20 @@
               rotation=180,
               origin={90,-80})));
 
-      equation
-        //Van Slyke equation:  - T=37
-        _cTH = -(1-ctHb/cHb)*((cHCO3-24.5)+betaX*(pH-7.4));
-      //  _cTH = -(1-(1-0.57)*(0.44))*((cHCO3-24.5)+betaX*(pH-7.4));
-
-        betaX = 2.3*ctHb + betaP;
-        betaP =  8*ctAlb + 0.075*ctGlb + 0.309*ctPO4;
-
-      //  _betaX = 0.11 * plasmaProteinConc(displayUnit="g/l"); //mmol/l
-
-      //Haldane effect:
-        _cTH = homotopy(_cTHox - 0.3 * (1-sO2),_cTHox);
-
-      //base excess
-        _BEox = - _cTHox;
-        _BE = - _cTH;
-
-        //erythrocytes:
-        pH_ery = homotopy(7.19 + 0.77*(pH-7.4) + 0.035*(1-sO2),7.19 + 0.77*(pH-7.4));
-
+      equation
+//Van Slyke equation:  - T=37
+        _cTH = -(1 - ctHb / cHb) * (cHCO3 - 24.5 + betaX * (pH - 7.4));
+//  _cTH = -(1-(1-0.57)*(0.44))*((cHCO3-24.5)+betaX*(pH-7.4));
+        betaX = 2.3 * ctHb + betaP;
+        betaP =  8*ctAlb + 0.075*ctGlb + 0.309*ctPO4;
+//  _betaX = 0.11 * plasmaProteinConc(displayUnit="g/l"); //mmol/l
+//Haldane effect:
+        _cTH = homotopy(_cTHox - 0.3 * (1 - sO2), _cTHox);
+//base excess
+        _BEox = -_cTHox;
+        _BE = - _cTH;
+//erythrocytes:
+        pH_ery = homotopy(7.19 + 0.77 * (pH - 7.4) + 0.035 * (1 - sO2), 7.19 + 0.77 * (pH - 7.4));
         annotation (
           preferredView = text,
           Documentation(info="<html>
@@ -41268,9 +41167,7 @@
               origin={-80,100})));
       equation
         _BEox = BEox / Modelica.Constants.F;
-
-      //  cTHox.conc*1000 = _cTHox;
-
+//  cTHox.conc*1000 = _cTHox;
         annotation (          Documentation(revisions="<html>
 
 <table cellspacing=\"2\" cellpadding=\"0\" border=\"0\"><tr>
@@ -41297,8 +41194,7 @@
       end BloodPhMeassure;
 
       model NormalSID
-       // extends BloodPhBase;
-
+       // extends BloodPhBase;
        Physiolibrary.Types.RealIO.ConcentrationInput ctAlb(
                                                  final displayUnit="mmol/l")
         "concentration of total plasma albumins(dofault=0.65mmol/l)"                  annotation (Placement(transformation(extent={{-120,72},
@@ -41524,10 +41420,8 @@
             points={{-100,62},{-69,62},{-69,64},{-38,64}},
             color={0,0,127},
             smooth=Smooth.None));
-
-      //  NBB = (1-Hct)( [HCO3]P(40mmHg,7.4) + tAlbP*-zAlbP(7.4) + tGlbP*-zGlb(7.4) + tPO4P*-zPO4(7.4) + tORGP*-zORG(7.4) + .. ) + Hct ( [HCO3]E(40mmHg,NpHE) + tHb*-zHb(sO2,sCO2,NpHE) + tPO4E*-zPO4(NpHE) ..)
-      //  NBB = 0;//_cTHox;
-
+//  NBB = (1-Hct)( [HCO3]P(40mmHg,7.4) + tAlbP*-zAlbP(7.4) + tGlbP*-zGlb(7.4) + tPO4P*-zPO4(7.4) + tORGP*-zORG(7.4) + .. ) + Hct ( [HCO3]E(40mmHg,NpHE) + tHb*-zHb(sO2,sCO2,NpHE) + tPO4E*-zPO4(NpHE) ..)
+//  NBB = 0;//_cTHox;
       connect(n_sO2.y, haemoglobin.sO2) annotation (Line(
           points={{-72.5,-60},{-38,-60}},
           color={0,0,127},
@@ -41588,16 +41482,13 @@
         parameter Real pKaHPO4=11.78 "HPO4 acid dissociation constant";
         parameter Real pKaKA=4.3
         "average Keto-acids acid dissociation constant";
-        //constant Real ml2l = 0.001;
-
+        //constant Real ml2l = 0.001;
         Real zPO4 "average charge of one phosphate in urine";
-                 //(displayUnit="Eq/Mol")
-
+                 //(displayUnit="Eq/Mol")
         Real zKA "average charge of one keto acid in purine";
-                //(displayUnit="Eq/Mol")
-
+                //(displayUnit="Eq/Mol")
         Real zCO2_qCO2 "charge outflow in (bi)carbonates to urine";
-                      //(displayUnit="Eq/min")
+                      //(displayUnit="Eq/min")
         Physiolibrary.Types.RealIO.PressureInput
                                            pCO2(displayUnit="mmHg")
         "partial CO2 pressure"                   annotation (Placement(transformation(
@@ -41660,8 +41551,7 @@
 
           zCO2_qCO2 = -CO2_solubility*pCO2*(10^(PHU-pKaCO2))*(qH2O);
 
-          qX + 1*qNa + 1*qK + 2*qMg + 2*qCa + 1*qNH4 + (-1)*qCl + (-2)*qSO4 + zPO4*qPO4 + zKA*qKA + zCO2_qCO2 = 0;  // electroneutrality of urine outflow
-
+          qX + 1*qNa + 1*qK + 2*qMg + 2*qCa + 1*qNH4 + (-1)*qCl + (-2)*qSO4 + zPO4*qPO4 + zKA*qKA + zCO2_qCO2 = 0;  // electroneutrality of urine outflow
         annotation (
           Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-120},{100,100}}),
                                graphics={
@@ -42141,7 +42031,7 @@
           "tissue interstitial bicarbonate concentration"
                                            annotation (Placement(transformation(extent={{-106,-4},
                     {-90,12}}),           iconTransformation(extent={{-10,-10},{10,10}},
-                origin={-90,-40})));                         //(final displayUnit="mEq/ml")
+                origin={-90,-40})));                                   //(final displayUnit="mEq/ml")
           Physiolibrary.Types.RealIO.pHOutput pH_interstitial
           "tissue interstitial pH"                                                      annotation (Placement(
                 transformation(extent={{24,-16},{44,4}}),   iconTransformation(
@@ -43459,8 +43349,7 @@
                     {34,106}}),           iconTransformation(extent={{-10,-10},{10,10}},
                 origin={-90,40})));                             //(final displayUnit="mEq/l")
         equation
-
-        //base excess
+//base excess
           ctHox_lessLactate/Modelica.Constants.F + cLactate = _cTHox;
 
          // cTH_interstitial = -(1-((ctHb_ery/3)/43))*((cHCO3_interstitial-24.5)+betaX*(pH_interstitial-7.42));
@@ -45214,7 +45103,8 @@
               Placement(transformation(extent={{-98,66},{-84,78}}),
                 iconTransformation(extent={{90,-10},{110,10}})));
 
-            Physiolibrary.Types.MolarFlowRate cTHfromTissues;//(displayUnit="mEq/min");
+            Physiolibrary.Types.MolarFlowRate cTHfromTissues;
+  //(displayUnit="mEq/min");
           equation
             cTHfromTissues = -( q_out.q + q_in.q);
 
@@ -45735,8 +45625,7 @@
                       {40,2}}),             iconTransformation(extent={{-10,-10},{10,10}},
                   origin={-90,-72})));
           equation
-
-          //base excess
+//base excess
             ctHox = _cTHox;
 
            // cTH_interstitial = -(1-((ctHb_ery/3)/43))*((cHCO3_interstitial-24.5)+betaX*(pH_interstitial-7.42));
@@ -45916,7 +45805,7 @@
                 origin={24,24})));
             Physiolibrary.Types.RealIO.MolarFlowRateInput LactateFromMetabolism                 annotation (Placement(transformation(extent={{-82,-16},
                       {-70,-4}}),                                                                                                   iconTransformation(extent={{-10,-10},{10,10}},         rotation=180,         origin={90,-60})));
-                                                                               //(displayUnit="mEq/min")
+                                                                               //(displayUnit="mEq/min")
           Physiolibrary.Chemical.Interfaces.ChemicalPort_b q_out annotation (
               Placement(transformation(extent={{74,14},{94,34}}),
                 iconTransformation(extent={{90,-10},{110,10}})));
@@ -45928,7 +45817,7 @@
                   transformation(extent={{-4,-4},{4,4}}),     iconTransformation(
                   extent={{-20,-20},{20,20}},
                   rotation=270,
-                  origin={20,-120})));                        //(displayUnit="mEq/l")
+                  origin={20,-120})));                                    //(displayUnit="mEq/l")
           Physiolibrary.Chemical.Interfaces.ChemicalPort_a q_in annotation (
               Placement(transformation(extent={{-16,16},{0,32}}),
                 iconTransformation(extent={{-110,-10},{-90,10}})));
@@ -46202,16 +46091,15 @@
           Physiolibrary.Types.Concentration cdCO2;
 
           Physiolibrary.Types.VolumeDensityOfCharge y2;
-        equation
-
-          //Henderson-Hasselbalch equation:
-          pK = 6.1 + (-0.0026)*(T-310.15);
-          aCO2 = 0.00023 * 10^(-0.0092*(T-310.15)); //solubility depends on temperature
-          cdCO2 = aCO2*pCO2;
-          y = -cdCO2*10^(pH-pK)* Modelica.Constants.F;  //bicarbonate
-
-          y2 = -cdCO2*10^(pH-6.35)* Modelica.Constants.F;  //bicarbonate
-
+        equation
+//Henderson-Hasselbalch equation:
+          pK = 6.1 + (-0.0026) * (T - 310.15);
+          aCO2 = 0.00023 * 10^(-0.0092*(T-310.15));
+//solubility depends on temperature
+          cdCO2 = aCO2 * pCO2;
+          y = -cdCO2*10^(pH-pK)* Modelica.Constants.F;
+//bicarbonate
+          y2 = -cdCO2 * 10 ^ (pH - 6.35) * Modelica.Constants.F;  //bicarbonate
           annotation (Icon(graphics={Text(
                   extent={{-79,-27},{79,27}},
                   lineColor={0,0,255},
@@ -46229,7 +46117,7 @@
           Physiolibrary.Types.MassConcentration tAlb_mass;
           parameter Physiolibrary.Types.MolarMass Alb_MolarMass(displayUnit="g/mol") = 66.463;
         equation
-          tAlb_mass=tAlb*Alb_MolarMass;  //kg/m3 = g/l
+          tAlb_mass=tAlb*Alb_MolarMass;  //kg/m3 = g/l
           y = - tAlb_mass * ( 0.123 * pH - 0.631) * Modelica.Constants.F;
 
         //where [ Albx- ] is in mEq / L and [ Albumin ] is in g / dL. Therefore, at pH 7.40, the charge contributed by 4.40 g / dL of albumin is approximately -12.3 mEq / L.
@@ -46254,7 +46142,7 @@
                                              ctGlb
             annotation (Placement(transformation(extent={{-120,-40},{-80,0}})));
         equation
-        //  y=-ctGlb*(0.075/0.81)*(pH-3.6);  //sklon -0.075/0.81 so siggaarda, pri 7.4 chcem -10 aby to pokrilo nastavene SID u Colemana
+//  y=-ctGlb*(0.075/0.81)*(pH-3.6);  //sklon -0.075/0.81 so siggaarda, pri 7.4 chcem -10 aby to pokrilo nastavene SID u Colemana
             y=-ctGlb*((0.075/0.77)*(pH-7.4) + 2.5/28)* Modelica.Constants.F; //chcem naboj -2.5 mEq/l pre normalnu koncentraciu 28 mg/l a pH=7.4
         //  y=-ctGlb*((0.075/0.77)*(pH-7.4) + 15.6/28)* Modelica.Constants.F; //chcem naboj -15.6 mEq/l pre normalnu koncentraciu 28 mg/l a pH=7.4
           annotation (Icon(graphics={Text(
@@ -46342,18 +46230,21 @@
                                              T
             annotation (Placement(transformation(extent={{-120,-120},{-80,-80}})));
         equation
-        aCO2 = 0.23 * 10^(-0.0092*(T-37)); //solubility depends on temperature
-        cdCO2 = aCO2*pCO2*0.001; //from mmol to mol
-
-        carbaminohaemoglobin = tHb_E*cdCO2*( ( H*H*((1-sO2)/(KzO*KcO)+sO2/(KzR*KcR)) + H*((1-sO2)/KcO + sO2/KcR) + cdCO2) / ((H*H/(KzR*KcR) + H/KcR + cdCO2)*(H*H/(KzO*KcO) + H/KcO + cdCO2))); //, where cdCO2=free disolved CO2 concentration in erythrocytes in mol/l
-        sCO2 = carbaminohaemoglobin/ tHb_E;
+        aCO2 = 0.23 * 10^(-0.0092*(T-37));
+//solubility depends on temperature
+          cdCO2 = aCO2 * pCO2 * 0.001;
+//from mmol to mol
+          carbaminohaemoglobin = tHb_E * cdCO2 * ((H * H * ((1 - sO2) / (KzO * KcO) + sO2 / (KzR * KcR)) + H * ((1 - sO2) / KcO + sO2 / KcR) + cdCO2) / ((H * H / (KzR * KcR) + H / KcR + cdCO2) * (H * H / (KzO * KcO) + H / KcO + cdCO2)));
+//, where cdCO2=free disolved CO2 concentration in erythrocytes in mol/l
+          sCO2 = carbaminohaemoglobin / tHb_E;
 
         y = -tHb_E*(sO2*(1-sCO2)*zOxyHb + (1-sO2)*(1-sCO2)*zDeoxyHb + sO2*sCO2*zOxyCarbaminoHb + (1-sO2)*sCO2*zDeoxyCarbaminoHb)* Modelica.Constants.F;
 
         zOxyHb = betaOxyHb * (pH-pIo);
         zDeoxyHb = betaDeoxyHb * (pH-pIr);
-        zOxyCarbaminoHb = zOxyHb + (1+2*10^(pKzO-pH))/(1+10^(pKzO-pH)); //= zOxyHb + -[O2HbNH2]/([O2HbNH2]+[O2HbNH3+]) + -2[O2HbNH3+]/([O2HbNH2]+[O2HbNH3+]), where pKZO=8.08
-        zDeoxyCarbaminoHb = zDeoxyHb + (1+2*10^(pKzR-pH))/(1+10^(pKzR-pH)); //betaOxyHb(pH) * (pH-pIO) + -[HbNH2]/([HbNH2]+[HbNH3+]) + -2[HbNH3+]/([HbNH2]+[HbNH3+]), where pKZR=7.14
+        zOxyCarbaminoHb = zOxyHb + (1+2*10^(pKzO-pH))/(1+10^(pKzO-pH));
+//= zOxyHb + -[O2HbNH2]/([O2HbNH2]+[O2HbNH3+]) + -2[O2HbNH3+]/([O2HbNH2]+[O2HbNH3+]), where pKZO=8.08
+          zDeoxyCarbaminoHb = zDeoxyHb + (1 + 2 * 10 ^ (pKzR - pH)) / (1 + 10 ^ (pKzR - pH)); //betaOxyHb(pH) * (pH-pIO) + -[HbNH2]/([HbNH2]+[HbNH3+]) + -2[HbNH3+]/([HbNH2]+[HbNH3+]), where pKZR=7.14
           annotation (Icon(graphics={Text(
                   extent={{-79,-27},{79,27}},
                   lineColor={0,0,255},
@@ -46399,9 +46290,8 @@
             transformation(extent={{-44,72},{-4,112}}), iconTransformation(
               extent={{-20,-18},{20,22}})));
 
-      //initial equation
-      //  ArtysPh.pH=7.4;
-
+//initial equation
+        //  ArtysPh.pH=7.4;
       BloodPhMeassure lungsPH
         annotation (Placement(transformation(extent={{28,28},{0,56}})));
       Tissues.Bloods tissues_blood_acidity
@@ -56140,9 +56030,9 @@
               rotation=270,
               origin={-20,50})));
         Physiolibrary.Types.Fraction KAdjustment;
-        //Real Cations( final quantity="Concentration", final unit = "mEq/l");
+        //Real Cations( final quantity="Concentration", final unit = "mEq/l");
         Physiolibrary.Types.VolumeDensityOfCharge Anions;
-      //  Real ProteinAnions( final quantity="Concentration", final unit = "mEq/l");
+      //  Real ProteinAnions( final quantity="Concentration", final unit = "mEq/l");
       /*  Library.Interfaces.RealInput_ HCO3(final quantity="Concentration",
       final displayUnit="mEq/l")                                                                               annotation (Placement(
         transformation(extent={{0,30},{40,70}}),  iconTransformation(
@@ -56151,11 +56041,11 @@
         origin={20,50})));
 */
       equation
-        q_in.q + q_out.q = 0;
-        //Cations = q_in.conc*1000+otherCations;
-        Anions = Cations;
-      //  ProteinAnions = Anions - otherStrongAnions - q_in.conc*1000 - HCO3;
-        KAdjustment = (Cations-(Anions-ProteinAnions))/(Cations+(Anions-ProteinAnions));
+        q_in.q + q_out.q = 0;
+//Cations = q_in.conc*1000+otherCations;
+        Anions = Cations;
+//  ProteinAnions = Anions - otherStrongAnions - q_in.conc*1000 - HCO3;
+        KAdjustment = (Cations - (Anions - ProteinAnions)) / (Cations + Anions - ProteinAnions);
         q_out.conc = (1+KAdjustment)*q_in.conc;
 
        annotation (
@@ -56829,9 +56719,9 @@
               rotation=270,
               origin={-20,50})));
         Physiolibrary.Types.Fraction KAdjustment;
-        //Real Cations( final quantity="Concentration", final unit = "mEq/l");
+        //Real Cations( final quantity="Concentration", final unit = "mEq/l");
         Physiolibrary.Types.VolumeDensityOfCharge Anions;
-       // Real ProteinAnions( final quantity="Concentration", final unit = "mEq/l");
+       // Real ProteinAnions( final quantity="Concentration", final unit = "mEq/l");
       /*  Library.Interfaces.RealInput_ HCO3(final quantity="Concentration",
       final displayUnit="mEq/l")                                                                               annotation (Placement(
         transformation(extent={{0,30},{40,70}}),  iconTransformation(
@@ -56840,11 +56730,11 @@
         origin={20,50})));
 */
       equation
-        q_in.q + q_out.q = 0;
-        //Cations = q_in.conc*1000+otherCations;
-        Anions = Cations;
-       // ProteinAnions = Anions - otherStrongAnions - q_in.conc*1000 - HCO3;
-        KAdjustment = (Cations-(Anions-ProteinAnions))/(Cations+(Anions-ProteinAnions));
+        q_in.q + q_out.q = 0;
+//Cations = q_in.conc*1000+otherCations;
+        Anions = Cations;
+// ProteinAnions = Anions - otherStrongAnions - q_in.conc*1000 - HCO3;
+        KAdjustment = (Cations - (Anions - ProteinAnions)) / (Cations + Anions - ProteinAnions);
         q_out.conc = (1+KAdjustment)*q_in.conc;
 
        annotation (
@@ -58397,10 +58287,13 @@
       parameter Real GILumenVolume(displayUnit="l") = 1.3;
 
       initial equation
-        A[1] = 1.3;  //Ca gut
-        A[2] = 0.5;   //Ca transporters
+        A[1] = 1.3;
+//Ca gut
+        A[2] = 0.5;
+//Ca transporters
         A[3] = 0.839;
-        A[4] = 32.9; //Ca pool
+        A[4] = 32.9;
+//Ca pool
         A[5] = 16.8;
         A[6] = 1260;
         A[7] = 53.9;
@@ -58408,38 +58301,36 @@
         A[9] = 126;
         A[10] = 0.5;
         A[11] = 1;
-      equation
-      //gut
-      v_intake = D[1] * H_plus(A[2],0.9,0.75,4,0.25); //alpha was calculated == 0.35
-      der( A[1])  = v_intake - v1_4;
+      equation
+//gut
+        v_intake = D[1] * H_plus(A[2], 0.9, 0.75, 4, 0.25);
+//alpha was calculated == 0.35
+        der(A[1]) = v_intake - v1_4;
       v1_4 = v1_4a + v1_4p;
       v1_4a = (H(A[1]/GILumenVolume,0.9,1,1) * (A[2]/0.5) / (A[1] + 0.75)) * A[1];
-      v1_4p = (0.0495) * A[1];
-
-      //transporters
-      H62p = H_plus(A[6]/ECFV2,0.037,90,1,0.003);
+      v1_4p = (0.0495) * A[1];
+//transporters
+        H62p = H_plus(A[6] / ECFV2, 0.037, 90, 1, 0.003);
       H62m = H_minus(A[6]/ECFV2,0.037,90,1,0.003);
-      der( A[2])  = H62p*(1-A[2])- H62m*A[2];
-
-      //Ca pool
-      der(A[4]) = 0; //v1_4 - v4_u;
-
-      //to urine
-      v4_u = (2-H(A[6]/ECFV2,2,90,1)) * (0.3*GFR*A[4] - H(A[4]/ECFV2,(-0.38+59.22)/0.317936,1.573,1)*H(A[7]/ECFV2,1.0615,53.9/ECFV2,1));
-      //!!it's used concentration of ecf Ca, not the mass such as in the article!!, H_4-u:alpha was calculated, H7,4-u:delta was assumed as normal ecf PTH concentration
-      //a = (2-H(A[6]/ECFV2,2,90,1)) * (0.3*GFR*A[4]);
-      //b = (2-H(A[6]/ECFV2,2,90,1)) * (H(A[4]/ECFV2,1,1.573,1)*H(A[7]/ECFV2,1.0615,53.9/ECFV2,1));
-      //v4_u = v1_4;
-
-      //calcitriol
-      der( A[6])  = A[9] -0.1 *A[6];
-      der( A[9])  = 6.3*H(A[7]/ECFV2, 1.90371, 1.549,0.1112)*( if A[5]<=16.8 then 1 else H_minus(A[5]/ECFV2,1.525,1.302,8.252,-1.78249))  -0.05 *A[9]; //H7,9:alpha was calculated,
-      //a = 6.3*H(A[7]/ECFV2, 1.90371 ,1.549,0.1112);
-      //c =  if A[5]<16.8 then 1 else H_minus(A[5]/ECFV2,1.525,1.302,8.252,1.181);
-      //b = 0.05 *A[9];
-
-      //PTH
-      der( A[7])  =  H_minus(A[4]/ECFV2,96.25, 3.037, 11.74,6249)*(A[10]/0.5)*A[11] - 7.143*A[7];
+      der( A[2])  = H62p*(1-A[2])- H62m*A[2];
+//Ca pool
+        der(A[4]) = 0;
+//v1_4 - v4_u;
+//to urine
+        v4_u = (2 - H(A[6] / ECFV2, 2, 90, 1)) * (0.3 * GFR * A[4] - H(A[4] / ECFV2, ((-0.38) + 59.22) / 0.317936, 1.573, 1) * H(A[7] / ECFV2, 1.0615, 53.9 / ECFV2, 1));
+//!!it's used concentration of ecf Ca, not the mass such as in the article!!, H_4-u:alpha was calculated, H7,4-u:delta was assumed as normal ecf PTH concentration
+//a = (2-H(A[6]/ECFV2,2,90,1)) * (0.3*GFR*A[4]);
+//b = (2-H(A[6]/ECFV2,2,90,1)) * (H(A[4]/ECFV2,1,1.573,1)*H(A[7]/ECFV2,1.0615,53.9/ECFV2,1));
+//v4_u = v1_4;
+//calcitriol
+        der(A[6]) = A[9] - 0.1 * A[6];
+      der( A[9])  = 6.3*H(A[7]/ECFV2, 1.90371, 1.549,0.1112)*( if A[5]<=16.8 then 1 else H_minus(A[5]/ECFV2,1.525,1.302,8.252,-1.78249))  -0.05 *A[9];
+//H7,9:alpha was calculated,
+//a = 6.3*H(A[7]/ECFV2, 1.90371 ,1.549,0.1112);
+//c =  if A[5]<16.8 then 1 else H_minus(A[5]/ECFV2,1.525,1.302,8.252,1.181);
+//b = 0.05 *A[9];
+//PTH
+        der(A[7]) = H_minus(A[4] / ECFV2, 96.25, 3.037, 11.74, 6249) * (A[10] / 0.5) * A[11] - 7.143 * A[7];
       a= H_minus(A[4]/ECFV2,96.25, 3.037, 11.74,6249)*(A[10]/0.5)*A[11];
       b=7.143*A[7];
       c=b/((A[10]/0.5)*A[11]);
@@ -58448,10 +58339,9 @@
       T64m = 1-(exp(0.03*(A[6]/14 - 90*(32.9/A[4]))) - exp(-0.03*(A[6]/14 - 90*(32.9/A[4])))) / (exp(0.03*(A[6]/14 - 90*(32.9/A[4]))) + exp(-0.03*(A[6]/14 - 90*(32.9/A[4]))));
       T64p = 1+(exp(0.03*(A[6]/14 - 90*(32.9/A[4]))) - exp(-0.03*(A[6]/14 - 90*(32.9/A[4])))) / (exp(0.03*(A[6]/14 - 90*(32.9/A[4]))) + exp(-0.03*(A[6]/14 - 90*(32.9/A[4]))));
 
-      der( A[11])  =0.0001604  *H_minus(A[6]/ECFV2,4.103,69,12.5,0.9) -0.0001604*A[11];
-
-      //phosphate
-      der(A[3])=0;
+      der( A[11])  =0.0001604  *H_minus(A[6]/ECFV2,4.103,69,12.5,0.9) -0.0001604*A[11];
+//phosphate
+        der(A[3]) = 0;
       der(A[5])=0;
       der(A[8])=0;
       end Calcium;
@@ -61154,8 +61044,7 @@
     end GangliaKidney;
 
     model BetaReceptorsActivityFactor
-      //extends Library.BaseFactor2;
-
+      //extends Library.BaseFactor2;
       Modelica.Blocks.Interfaces.RealInput GangliaGeneral_NA(final quantity=
             "Frequency", final displayUnit="Hz")       annotation (Placement(transformation(extent={{-100,40},
                 {-80,60}}), iconTransformation(extent={{-108,-70},{-88,-50}})));
@@ -61261,8 +61150,7 @@
     end BetaReceptorsActivityFactor;
 
     model AplhaReceptorsActivityFactor
-      //extends Library.BaseFactor2;
-
+      //extends Library.BaseFactor2;
       Physiolibrary.Types.RealIO.FractionInput GangliaGeneral_NA(displayUnit="1")       annotation (Placement(transformation(extent={{-100,40},
                 {-80,60}}), iconTransformation(extent={{-108,-70},{-88,-50}})));
       Physiolibrary.Types.RealIO.FractionInput AlphaPool_Effect
@@ -62512,14 +62400,14 @@
     model BladderHeat
       extends Physiolibrary.Icons.Bladder;
 
-      parameter Physiolibrary.Types.Density urineDensity = 1000; // kg/m3
+      parameter Physiolibrary.Types.Density urineDensity = 1000;       // kg/m3
     Physiolibrary.Thermal.Components.HeatAccumulation Bladder(
       stateName="BladderTemperature.Mass",
       useMassInput=true,
       relativeHeat_start=0)
       annotation (Placement(transformation(extent={{6,-80},{26,-60}})));
-                            //(259707.204) - 310.15*weight*(4186.8))
-    //    initialTemperature(displayUnit="degC"),
+                            //(259707.204) - 310.15*weight*(4186.8))
+      //    initialTemperature(displayUnit="degC"),
     Physiolibrary.Types.BusConnector busConnector annotation (Placement(
           transformation(extent={{-72,-44},{-52,-24}}), iconTransformation(
             extent={{-104,86},{-84,106}})));
@@ -62579,9 +62467,8 @@
       useMassInput=true,
       relativeHeat_start=0)
       annotation (Placement(transformation(extent={{-50,-82},{-30,-62}})));
-                           //(1293302.52) - 310.15*weight*(4186.8))
-
-    //  initialTemperature(displayUnit="degC") = 310,
+                           //(1293302.52) - 310.15*weight*(4186.8))
+      //  initialTemperature(displayUnit="degC") = 310,
     Physiolibrary.Thermal.Components.Conductor resistorWithCondParam(
         Conductance(displayUnit="kcal/(min.degC)") =            0.6978)
       annotation (Placement(transformation(
@@ -62713,9 +62600,8 @@
       useMassInput=true,
       relativeHeat_start=0)
       annotation (Placement(transformation(extent={{-8,-8},{12,12}})));
-                           //(29579490.792) - 310.15*weight*(3475.044))
-
-         // initialTemperature=310.166,
+                           //(29579490.792) - 310.15*weight*(3475.044))
+      // initialTemperature=310.166,
     Physiolibrary.Thermal.Components.IdealRadiator muscleFlux(SpecificHeat=
           3851.856, useMassFlowInput=true)
       annotation (Placement(transformation(extent={{40,-8},{20,12}})));
@@ -62807,9 +62693,8 @@
       useMassInput=true,
       relativeHeat_start=-75362.4)
       annotation (Placement(transformation(extent={{30,-72},{50,-52}})));
-                            //(2363163.8976) - 310.15*weight*(3475.044))
-
-          //initialTemperature=300.731,
+                            //(2363163.8976) - 310.15*weight*(3475.044))
+      //initialTemperature=300.731,
     Physiolibrary.Thermal.Components.IdealRadiator skinFlux(
       useMassFlowInput=true, SpecificHeat(displayUnit="kcal/(kg.K)") = 3851.856)
       annotation (Placement(transformation(extent={{38,-40},{58,-20}})));
@@ -63070,7 +62955,7 @@
 
     model Heat2
      extends Physiolibrary.Icons.Heat;
-    //      initialTemperature(displayUnit="degC") = 310.15,
+    //      initialTemperature(displayUnit="degC") = 310.15,
     Physiolibrary.Types.BusConnector busConnector annotation (Placement(
           transformation(extent={{-104,86},{-84,106}}), iconTransformation(
             extent={{-104,86},{-84,106}})));
@@ -64141,8 +64026,7 @@
       useMassInput=true,
       relativeHeat_start=0)
       annotation (Placement(transformation(extent={{-6,-54},{14,-34}})));
-                           //(45005587.92) - 310.15*weight*(3475.044))
-
+                           //(45005587.92) - 310.15*weight*(3475.044))
       Physiolibrary.Types.RealIO.TemperatureOutput
                                             core_T
                                             annotation (Placement(
@@ -64611,7 +64495,7 @@
 
     model Heat3
      extends Physiolibrary.Icons.Heat;
-    //      initialTemperature(displayUnit="degC") = 310.15,
+    //      initialTemperature(displayUnit="degC") = 310.15,
     Physiolibrary.Types.BusConnector busConnector annotation (Placement(
           transformation(extent={{-104,86},{-84,106}}), iconTransformation(
             extent={{-104,86},{-84,106}})));
@@ -69001,8 +68885,8 @@
       Boolean a(start=false);
       Boolean b(start=true);
       Boolean c(start=false);
-    //initial equation
-    //  c=false;
+    //initial equation
+      //  c=false;
     equation
       a=FunctionEffect<effectAtFailing;
       b=FunctionEffect>effectAtRevitaling;
@@ -69381,37 +69265,37 @@
     end PatientStatus;
 
     block Normal
-      extends Modelica.StateGraph.InitialStepWithSignal;
+      extends Modelica.StateGraph.InitialStepWithSignal(nIn = 1, nOut = 1);
       extends Physiolibrary.Icons.StatusNormal;
     end Normal;
 
     block Confused
-      extends Modelica.StateGraph.StepWithSignal;
+      extends Modelica.StateGraph.StepWithSignal(nIn = 1, nOut = 1);
       extends Physiolibrary.Icons.StatusConfused;
     end Confused;
 
     block Impaired
-      extends Modelica.StateGraph.StepWithSignal;
+      extends Modelica.StateGraph.StepWithSignal(nIn = 1, nOut = 1);
       extends Physiolibrary.Icons.StatusImpaired;
     end Impaired;
 
     block Comatose
-      extends Modelica.StateGraph.StepWithSignal;
+      extends Modelica.StateGraph.StepWithSignal(nIn = 1, nOut = 1);
       extends Physiolibrary.Icons.StatusComatose;
     end Comatose;
 
     block NotBreathing
-      extends Modelica.StateGraph.StepWithSignal;
+      extends Modelica.StateGraph.StepWithSignal(nIn = 1, nOut = 1);
       extends Physiolibrary.Icons.StatusNotBreathing;
     end NotBreathing;
 
     block MayBeDead
-      extends Modelica.StateGraph.StepWithSignal;
+      extends Modelica.StateGraph.StepWithSignal(nIn = 1, nOut = 1);
       extends Physiolibrary.Icons.StatusMayBeDead;
     end MayBeDead;
 
     block IsReallyDead
-      extends Modelica.StateGraph.StepWithSignal;
+      extends Modelica.StateGraph.StepWithSignal(nIn = 1, nOut = 1);
       extends Physiolibrary.Icons.StatusIsReallyDead;
     end IsReallyDead;
 
@@ -69663,6 +69547,7 @@
       end RightHeart;
     end Tissues;
 
+
     package IO_Bus
         extends Physiolibrary.Types.IO_Bus;
       redeclare model extends Variables
@@ -69691,9 +69576,9 @@
       T.Fraction KidneyFunctionEffect(varName="Kidney-Function.Effect")
         "Kidney tissue function effect. []"
       annotation (Placement(transformation(extent={{-36,80},{-30,86}})));
-      //T.Fraction KidneyFunction_Effect(varName="Kidney-Function.Effect")
-      //    "Kidney tissue function effect. []"
-      //annotation (Placement(transformation(extent={{-36,90},{-30,96}})));
+      //T.Fraction KidneyFunction_Effect(varName="Kidney-Function.Effect")
+          //    "Kidney tissue function effect. []"
+          //annotation (Placement(transformation(extent={{-36,90},{-30,96}})));
       T.Fraction Kidney_StructureEffect(varName="Kidney-Structure.Effect")
         "Kidney tissue structural damage effect. []"
       annotation (Placement(transformation(extent={{-36,100},{-30,106}})));
@@ -70195,7 +70080,6 @@
           smooth=Smooth.None));
       end Status_test_SI;
     end IO_Bus;
-
     annotation (Documentation(revisions="<html>
 <table cellspacing=\"2\" cellpadding=\"0\" border=\"0\"><tr>
 <td><p>Author:</p></td>
@@ -70220,7 +70104,7 @@
   end Status;
 
 
-  annotation (uses(Modelica(version="3.2.1"), Physiolibrary(version="2.3.1")),                           Documentation(revisions="<html>
+  annotation (uses(Modelica(version = "4.0.0")),                           Documentation(revisions="<html>
 <table cellspacing=\"2\" cellpadding=\"0\" border=\"0\"><tr>
 <td><p>Author:</p></td>
 <td><p>Marek Matejak</p></td>
