Skip to content

Commit

Permalink
Update pumpdefinitions
Browse files Browse the repository at this point in the history
  • Loading branch information
Elias Ruemmler committed Mar 7, 2019
1 parent 0808341 commit 68f3c7b
Show file tree
Hide file tree
Showing 8 changed files with 340 additions and 330 deletions.
27 changes: 17 additions & 10 deletions FlowCalc/Pump.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public class Pump
/// <summary>
/// Modellname der Pumpe
/// </summary>
[XmlElement("Modell")]
public string ModellName { get; set; }

/// <summary>
Expand All @@ -50,16 +51,32 @@ public class Pump
/// in [kW]
/// </summary>
public double PowerOutput { get; set; }


/// <summary>
/// Name des Erstellers der Pumpendefinition
/// </summary>
[XmlElement("Author")]
public string AuthorPumpFile { get; set; }

/// <summary>
/// Emailadresse des Erstellers der Pumpendefinition
/// </summary>

[XmlElement("AuthorEmail")]
public string AuthorEmailPumpFile { get; set; }

/// <summary>
/// Leistungskurve
/// </summary>
[XmlArrayItem("Ipp")]
public List<PumpPerformancePoint> PerformanceCurve { get; set; }

/// <summary>
/// Maximale Meter Wassersäule (Förderhöhe)
/// in [m]
/// </summary>
[XmlIgnore]
public double MaxTotalHead
{
get
Expand All @@ -71,16 +88,6 @@ public double MaxTotalHead
}
}

/// <summary>
/// Name des Erstellers der Pumpendefinition
/// </summary>
public string AuthorPumpFile { get; set; }

/// <summary>
/// Emailadresse des Erstellers der Pumpendefinition
/// </summary>
public string AuthorEmailPumpFile { get; set; }

#endregion Properties

#region Constructor
Expand Down
3 changes: 3 additions & 0 deletions FlowCalc/PumpPerformancePoint.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Serialization;

namespace FlowCalc
{
Expand All @@ -21,12 +22,14 @@ public class PumpPerformancePoint
/// Meter Wassersäule (Förderhöhe) H
/// in mWS
/// </summary>
[XmlElement("H")]
public double TotalDynamicHead { get; set; }

/// <summary>
/// Volumenstrom Q
/// in [m^3/h]
/// </summary>
[XmlElement("Q")]
public double FlowRate { get; set; }

#endregion Properties
Expand Down
112 changes: 56 additions & 56 deletions PumpDefinitions/AquaPlus6.xml
View file
Original file line number Diff line number Diff line change
@@ -1,64 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<Pump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<ModellName>AquaPlus 6</ModellName>
<Modell>AquaPlus 6</Modell>
<Manufacturer>Aqua TechniX GmbH</Manufacturer>
<PowerOutput>0.25</PowerOutput>
<NominalFlowRate>6</NominalFlowRate>
<NominalQ>6</NominalQ>
<NominalDynamicHead>8</NominalDynamicHead>
<AuthorPumpFile>Elias Ruemmler</AuthorPumpFile>
<AuthorEmailPumpFile>pool@100prznt.de</AuthorEmailPumpFile>
<Author>Elias Ruemmler</Author>
<AuthorEmail>pool@100prznt.de</AuthorEmail>
<PerformanceCurve>
<PumpPerformancePoint>
<TotalDynamicHead>10.9</TotalDynamicHead>
<FlowRate>0</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>10.6</TotalDynamicHead>
<FlowRate>1</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>10.2</TotalDynamicHead>
<FlowRate>2</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>9.8</TotalDynamicHead>
<FlowRate>3</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>9.3</TotalDynamicHead>
<FlowRate>4</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>8.8</TotalDynamicHead>
<FlowRate>5</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>8</TotalDynamicHead>
<FlowRate>6</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>7.25</TotalDynamicHead>
<FlowRate>7</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>6.4</TotalDynamicHead>
<FlowRate>8</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>5.5</TotalDynamicHead>
<FlowRate>9</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>4.8</TotalDynamicHead>
<FlowRate>10</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>3.3</TotalDynamicHead>
<FlowRate>11</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>1.6</TotalDynamicHead>
<FlowRate>12</FlowRate>
</PumpPerformancePoint>
<Ipp>
<H>10.9</H>
<Q>0</Q>
</Ipp>
<Ipp>
<H>10.6</H>
<Q>1</Q>
</Ipp>
<Ipp>
<H>10.2</H>
<Q>2</Q>
</Ipp>
<Ipp>
<H>9.8</H>
<Q>3</Q>
</Ipp>
<Ipp>
<H>9.3</H>
<Q>4</Q>
</Ipp>
<Ipp>
<H>8.8</H>
<Q>5</Q>
</Ipp>
<Ipp>
<H>8</H>
<Q>6</Q>
</Ipp>
<Ipp>
<H>7.25</H>
<Q>7</Q>
</Ipp>
<Ipp>
<H>6.4</H>
<Q>8</Q>
</Ipp>
<Ipp>
<H>5.5</H>
<Q>9</Q>
</Ipp>
<Ipp>
<H>4.8</H>
<Q>10</Q>
</Ipp>
<Ipp>
<H>3.3</H>
<Q>11</Q>
</Ipp>
<Ipp>
<H>1.6</H>
<Q>12</Q>
</Ipp>
</PerformanceCurve>
</Pump>
128 changes: 64 additions & 64 deletions PumpDefinitions/AquaPlus8.xml
View file
Original file line number Diff line number Diff line change
@@ -1,72 +1,72 @@
<?xml version="1.0" encoding="utf-8"?>
<Pump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<ModellName>AquaPlus 8</ModellName>
<Modell>AquaPlus 8</Modell>
<Manufacturer>Aqua TechniX GmbH</Manufacturer>
<PowerOutput>0.40</PowerOutput>
<NominalFlowRate>8</NominalFlowRate>
<NominalQ>8</NominalQ>
<NominalDynamicHead>9</NominalDynamicHead>
<AuthorPumpFile>Elias Ruemmler</AuthorPumpFile>
<AuthorEmailPumpFile>pool@100prznt.de</AuthorEmailPumpFile>
<Author>Elias Ruemmler</Author>
<AuthorEmail>pool@100prznt.de</AuthorEmail>
<PerformanceCurve>
<PumpPerformancePoint>
<TotalDynamicHead>12</TotalDynamicHead>
<FlowRate>0</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>11.8</TotalDynamicHead>
<FlowRate>1</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>11.6</TotalDynamicHead>
<FlowRate>2</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>11.2</TotalDynamicHead>
<FlowRate>3</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>10.7</TotalDynamicHead>
<FlowRate>4</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>10.4</TotalDynamicHead>
<FlowRate>5</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>9.7</TotalDynamicHead>
<FlowRate>6</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>9</TotalDynamicHead>
<FlowRate>7</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>8.4</TotalDynamicHead>
<FlowRate>8</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>7.75</TotalDynamicHead>
<FlowRate>9</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>7.15</TotalDynamicHead>
<FlowRate>10</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>6</TotalDynamicHead>
<FlowRate>11</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>5</TotalDynamicHead>
<FlowRate>12</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>4.1</TotalDynamicHead>
<FlowRate>13</FlowRate>
</PumpPerformancePoint>
<PumpPerformancePoint>
<TotalDynamicHead>3</TotalDynamicHead>
<FlowRate>14</FlowRate>
</PumpPerformancePoint>
<Ipp>
<H>12</H>
<Q>0</Q>
</Ipp>
<Ipp>
<H>11.8</H>
<Q>1</Q>
</Ipp>
<Ipp>
<H>11.6</H>
<Q>2</Q>
</Ipp>
<Ipp>
<H>11.2</H>
<Q>3</Q>
</Ipp>
<Ipp>
<H>10.7</H>
<Q>4</Q>
</Ipp>
<Ipp>
<H>10.4</H>
<Q>5</Q>
</Ipp>
<Ipp>
<H>9.7</H>
<Q>6</Q>
</Ipp>
<Ipp>
<H>9</H>
<Q>7</Q>
</Ipp>
<Ipp>
<H>8.4</H>
<Q>8</Q>
</Ipp>
<Ipp>
<H>7.75</H>
<Q>9</Q>
</Ipp>
<Ipp>
<H>7.15</H>
<Q>10</Q>
</Ipp>
<Ipp>
<H>6</H>
<Q>11</Q>
</Ipp>
<Ipp>
<H>5</H>
<Q>12</Q>
</Ipp>
<Ipp>
<H>4.1</H>
<Q>13</Q>
</Ipp>
<Ipp>
<H>3</H>
<Q>14</Q>
</Ipp>
</PerformanceCurve>
</Pump>
Loading

0 comments on commit 68f3c7b

Please sign in to comment.