diff --git a/VectoCore/VectoCore/Models/GenericModelData/GenericBusEngineData.cs b/VectoCore/VectoCore/Models/GenericModelData/GenericBusEngineData.cs
index 903d2f097b2da186ce1c7aa0290e11ac98f8ef13..c89a11e460e15954cc7312fdf3b4eec8d17b48b0 100644
--- a/VectoCore/VectoCore/Models/GenericModelData/GenericBusEngineData.cs
+++ b/VectoCore/VectoCore/Models/GenericModelData/GenericBusEngineData.cs
@@ -131,10 +131,10 @@ namespace TUGraz.VectoCore.Models.Declaration
var ressourceId = GetEngineRessourceId(engineMode);
var nIdle = engineMode.IdleSpeed.AsRPM;
- var ratedSpeed = fullLoadCurve.RatedSpeed.AsRPM;
- var maxTorque = fullLoadCurve.MaxTorque.Value();
+ var n95h = fullLoadCurve.N95hSpeed.AsRPM;
+ var ratedPower = fullLoadCurve.MaxPower.Value();
- var denormalizedData = DenormalizeData(ressourceId, nIdle, ratedSpeed, maxTorque);
+ var denormalizedData = DenormalizeData(ressourceId, nIdle, n95h, ratedPower);
var engineSpeed = denormalizedData.AsEnumerable().Select(r =>
r.Field<string>(FuelConsumptionMapReader.Fields.EngineSpeed).ToDouble()).ToArray();
@@ -180,7 +180,7 @@ namespace TUGraz.VectoCore.Models.Declaration
- private DataTable DenormalizeData(string ressourceId, double nIdle, double ratedSpeed, double maxTorque)
+ private DataTable DenormalizeData(string ressourceId, PerSecond nIdle, PerSecond n95h, Watt ratedPower)
{
var normalized = VectoCSVFile.ReadStream(RessourceHelper.ReadStream(ressourceId), source: ressourceId);
@@ -190,14 +190,14 @@ namespace TUGraz.VectoCore.Models.Declaration
result.Columns.Add(FuelConsumptionMapReader.Fields.FuelConsumption);
foreach (DataRow row in normalized.Rows) {
- var engineSpeed = DenormalizeEngineSpeed((string)row[FuelConsumptionMapReader.Fields.EngineSpeed],
- nIdle, ratedSpeed);
- var torque = DenormalizeTorque((string)row[FuelConsumptionMapReader.Fields.Torque], maxTorque);
- var fc = DenormalizeFC((string)row[FuelConsumptionMapReader.Fields.FuelConsumption], maxTorque);
+ var engineSpeed = row.Field<double>("n_norm") * (n95h - nIdle) + nIdle;
+ var pwr = row.Field<double>("P_norm") * ratedPower;
+ var torque = pwr / engineSpeed;
+ var fc = row.Field<double>("FC_norm") * pwr;
var newRow = result.NewRow();
- newRow[FuelConsumptionMapReader.Fields.EngineSpeed] = Math.Round(engineSpeed,2, MidpointRounding.AwayFromZero);
- newRow[FuelConsumptionMapReader.Fields.Torque] = Math.Round(torque, 2, MidpointRounding.AwayFromZero);
+ newRow[FuelConsumptionMapReader.Fields.EngineSpeed] = Math.Round(engineSpeed.AsRPM,2, MidpointRounding.AwayFromZero);
+ newRow[FuelConsumptionMapReader.Fields.Torque] = Math.Round(torque.Value(), 2, MidpointRounding.AwayFromZero);
newRow[FuelConsumptionMapReader.Fields.FuelConsumption] = Math.Round(fc, 2, MidpointRounding.AwayFromZero);
result.Rows.Add(newRow);
}
@@ -205,23 +205,5 @@ namespace TUGraz.VectoCore.Models.Declaration
return result;
}
- [MethodImpl(MethodImplOptions.AggressiveInlining)]
- private double DenormalizeFC(string fc, double mRated)
- {
- return fc.ToDouble() * mRated;
- }
-
- [MethodImpl(MethodImplOptions.AggressiveInlining)]
- private double DenormalizeTorque(string torque, double mRated)
- {
- return torque.ToDouble() * mRated;
- }
-
- [MethodImpl(MethodImplOptions.AggressiveInlining)]
- private double DenormalizeEngineSpeed(string engineSpeed, double nIdle, double nRated)
- {
- return engineSpeed.ToDouble() * (nRated - nIdle) + nIdle;
- }
-
}
}
diff --git a/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EngineConsumptionMap_CI_Normed.vmap b/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EngineConsumptionMap_CI_Normed.vmap
index 945952c733112095a57c1ee1dc6726f548387946..b50d63eff1931c4985b1ee49e7580f9973457ffc 100644
--- a/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EngineConsumptionMap_CI_Normed.vmap
+++ b/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EngineConsumptionMap_CI_Normed.vmap
@@ -1,142 +1,157 @@
-engine speed , torque , fuel consumption
--0.08 , 0 , 0.833714286
--0.08 , 0.123942857 , 2.022142857
--0.08 , 0.247885714 , 3.39252
--0.08 , 0.371828571 , 4.905685714
--0.08 , 0.495771429 , 6.119011429
--0.08 , 0.619714286 , 7.459428571
--0.08 , 0.743657143 , 8.900257143
--0.08 , 0.8676 , 10.34146857
--0.08 , 0.991542857 , 11.78267429
-0 , 0 , 0.833714286
-0 , 0.123942857 , 2.022142857
-0 , 0.247885714 , 3.39252
-0 , 0.371828571 , 4.905685714
-0 , 0.495771429 , 6.119011429
-0 , 0.619714286 , 7.459428571
-0 , 0.743657143 , 8.900257143
-0 , 0.8676 , 10.34146857
-0 , 0.991542857 , 11.78267429
-0 , 1.115485714 , 13.22388571
-0 , 1.239428571 , 14.66509714
-0.124083333 , 0 , 1.012394286
-0.124083333 , 0.123942857 , 2.450154286
-0.124083333 , 0.247885714 , 4.188034286
-0.124083333 , 0.371828571 , 5.858811429
-0.124083333 , 0.495771429 , 7.551171429
-0.124083333 , 0.619714286 , 9.297765714
-0.124083333 , 0.743657143 , 11.14539429
-0.124083333 , 0.8676 , 12.98051429
-0.124083333 , 0.991542857 , 14.89544
-0.124083333 , 1.115485714 , 16.78917143
-0.124083333 , 1.239428571 , 18.68569143
-0.248166667 , 0 , 1.349228571
-0.248166667 , 0.123942857 , 3.069422857
-0.248166667 , 0.247885714 , 4.998531429
-0.248166667 , 0.371828571 , 6.868497143
-0.248166667 , 0.495771429 , 8.938565714
-0.248166667 , 0.619714286 , 11.05635429
-0.248166667 , 0.743657143 , 13.18348571
-0.248166667 , 0.8676 , 15.35103429
-0.248166667 , 0.991542857 , 17.60867429
-0.248166667 , 1.115485714 , 19.9168
-0.248166667 , 1.239428571 , 22.37433714
-0.37225 , 0 , 1.69612
-0.37225 , 0.123942857 , 3.693537143
-0.37225 , 0.247885714 , 5.772954286
-0.37225 , 0.371828571 , 7.916434286
-0.37225 , 0.495771429 , 10.32497714
-0.37225 , 0.619714286 , 12.79068571
-0.37225 , 0.743657143 , 15.16765714
-0.37225 , 0.8676 , 17.62722857
-0.37225 , 0.991542857 , 20.17409714
-0.37225 , 1.115485714 , 22.88359429
-0.37225 , 1.239428571 , 25.80726857
-0.496308333 , 0 , 1.88412
-0.496308333 , 0.123942857 , 4.109457143
-0.496308333 , 0.247885714 , 6.451142857
-0.496308333 , 0.371828571 , 8.983194286
-0.496308333 , 0.495771429 , 11.76012571
-0.496308333 , 0.619714286 , 14.56274857
-0.496308333 , 0.743657143 , 17.27015429
-0.496308333 , 0.8676 , 20.00355429
-0.496308333 , 0.991542857 , 22.87234286
-0.496308333 , 1.115485714 , 25.99822286
-0.496308333 , 1.239428571 , 29.05948571
-0.632658333 , 0 , 2.344085714
-0.632658333 , 0.123942857 , 4.720297143
-0.632658333 , 0.247885714 , 7.47568
-0.632658333 , 0.371828571 , 10.35794857
-0.632658333 , 0.495771429 , 13.28320571
-0.632658333 , 0.619714286 , 16.34954857
-0.632658333 , 0.743657143 , 19.53486286
-0.632658333 , 0.8676 , 22.72797714
-0.632658333 , 0.991542857 , 26.25164
-0.632658333 , 1.115485714 , 29.99198286
-0.632658333 , 1.239428571 , 33.34870286
-0.736666667 , 0 , 2.677051429
-0.736666667 , 0.123942857 , 5.251885714
-0.736666667 , 0.247885714 , 8.260394286
-0.736666667 , 0.371828571 , 11.38810286
-0.736666667 , 0.495771429 , 14.6036
-0.736666667 , 0.619714286 , 17.90076
-0.736666667 , 0.743657143 , 21.35075429
-0.736666667 , 0.8676 , 24.89823429
-0.736666667 , 0.991542857 , 28.83475429
-0.736666667 , 1.115485714 , 32.91686857
-0.736666667 , 1.239428571 , 36.67493714
-0.84075 , 0 , 3.006514286
-0.84075 , 0.123942857 , 5.82852
-0.84075 , 0.247885714 , 9.054965714
-0.84075 , 0.371828571 , 12.42696
-0.84075 , 0.495771429 , 16.02126286
-0.84075 , 0.619714286 , 19.56134857
-0.84075 , 0.743657143 , 23.23957143
-0.84075 , 0.8676 , 27.14198857
-0.84075 , 0.991542857 , 31.43714857
-0.84075 , 1.115485714 , 35.80281143
-0.84075 , 1.239428571 , 40.041
-0.944833333 , 0 , 3.434742857
-0.944833333 , 0.123942857 , 6.592051663
-0.944833333 , 0.247885714 , 9.988029651
-0.944833333 , 0.371828571 , 13.71403235
-0.944833333 , 0.495771429 , 17.68206855
-0.944833333 , 0.619714286 , 21.41857826
-0.944833333 , 0.743657143 , 25.49572247
-0.944833333 , 0.8676 , 29.75499887
-0.944833333 , 0.991542857 , 34.28816316
-0.944833333 , 1.115485714 , 39.00082984
-0.944833333 , 1.239428571 , 43.64633474
-1.048841667 , 0 , 4.1168628
-1.048841667 , 0.123942857 , 7.510599514
-1.048841667 , 0.247885714 , 11.05083632
-1.048841667 , 0.371828571 , 15.01283399
-1.048841667 , 0.495771429 , 19.33653626
-1.048841667 , 0.619714286 , 23.5892016
-1.048841667 , 0.743657143 , 28.03754633
-1.048841667 , 0.8676 , 32.60922662
-1.048841667 , 0.991542857 , 37.32819753
-1.048841667 , 1.115485714 , 42.21491227
-1.048841667 , 1.239428571 , 47.07674427
-1.15285 , 0 , 4.798982743
-1.15285 , 0.123942857 , 8.429147366
-1.15285 , 0.247885714 , 12.11364299
-1.15285 , 0.371828571 , 16.31163564
-1.15285 , 0.495771429 , 20.99100397
-1.15285 , 0.619714286 , 25.75982494
-1.15285 , 0.743657143 , 30.57937019
-1.15285 , 0.8676 , 35.46345438
-1.15285 , 0.991542857 , 40.3682319
-1.15285 , 1.115485714 , 45.42899471
-1.15285 , 1.239428571 , 50.5071538
-1.256858333 , 0 , 5.481102686
-1.256858333 , 0.123942857 , 9.347695217
-1.256858333 , 0.247885714 , 13.17644966
-1.256858333 , 0.371828571 , 17.61043729
-1.256858333 , 0.495771429 , 22.64547167
-1.256858333 , 0.619714286 , 27.93044827
-1.256858333 , 0.743657143 , 33.12119405
-1.256858333 , 0.8676 , 38.31768213
-1.256858333 , 0.991542857 , 43.40826627
-1.256858333 , 1.115485714 , 48.64307714
-1.256858333 , 1.239428571 , 53.93756333
\ No newline at end of file
+n_norm , P_norm , FC_norm [(g/h)/P_rated]
+-0.08 , 0 , 4.168571429
+-0.08 , 0.032707749 , 10.11071429
+-0.08 , 0.065415499 , 16.9626
+-0.08 , 0.098123248 , 24.52842857
+-0.08 , 0.130830998 , 30.59505714
+-0.08 , 0.163538747 , 37.29714286
+-0.08 , 0.196246497 , 44.50128571
+-0.08 , 0.228954246 , 51.70734286
+-0.08 , 0.261661995 , 58.91337143
+-0.08 , 0.294369745 , 66.11942857
+-0.08 , 0.327077494 , 73.32548571
+-0.08 , 0.490616242 , 109.9882286
+0 , 0 , 4.168571429
+0 , 0.038937797 , 10.11071429
+0 , 0.077875594 , 16.9626
+0 , 0.116813391 , 24.52842857
+0 , 0.155751188 , 30.59505714
+0 , 0.194688985 , 37.29714286
+0 , 0.233626782 , 44.50128571
+0 , 0.272564579 , 51.70734286
+0 , 0.311502376 , 58.91337143
+0 , 0.350440173 , 66.11942857
+0 , 0.389377969 , 73.32548571
+0 , 0.584066954 , 109.9882286
+0.124083333 , 0 , 5.061971429
+0.124083333 , 0.04860086 , 12.25077143
+0.124083333 , 0.09720172 , 20.94017143
+0.124083333 , 0.145802581 , 29.29405714
+0.124083333 , 0.194403441 , 37.75585714
+0.124083333 , 0.243004301 , 46.48882857
+0.124083333 , 0.291605161 , 55.72697143
+0.124083333 , 0.340206022 , 64.90257143
+0.124083333 , 0.388806882 , 74.4772
+0.124083333 , 0.437407742 , 83.94585714
+0.124083333 , 0.486008602 , 93.42845714
+0.124083333 , 0.729012903 , 140.1426857
+0.248166667 , 0 , 6.746142857
+0.248166667 , 0.058263923 , 15.34711429
+0.248166667 , 0.116527847 , 24.99265714
+0.248166667 , 0.17479177 , 34.34248571
+0.248166667 , 0.233055694 , 44.69282857
+0.248166667 , 0.291319617 , 55.28177143
+0.248166667 , 0.349583541 , 65.91742857
+0.248166667 , 0.407847464 , 76.75517143
+0.248166667 , 0.466111388 , 88.04337143
+0.248166667 , 0.524375311 , 99.584
+0.248166667 , 0.582639235 , 111.8716857
+0.248166667 , 0.873958852 , 167.8075286
+0.37225 , 0 , 8.4806
+0.37225 , 0.067926987 , 18.46768571
+0.37225 , 0.135853974 , 28.86477143
+0.37225 , 0.20378096 , 39.58217143
+0.37225 , 0.271707947 , 51.62488571
+0.37225 , 0.339634934 , 63.95342857
+0.37225 , 0.407561921 , 75.83828571
+0.37225 , 0.475488907 , 88.13614286
+0.37225 , 0.543415894 , 100.8704857
+0.37225 , 0.611342881 , 114.4179714
+0.37225 , 0.679269868 , 129.0363429
+0.37225 , 1.018904802 , 193.5545143
+0.496308333 , 0 , 9.4206
+0.496308333 , 0.077588103 , 20.54728571
+0.496308333 , 0.155176206 , 32.25571429
+0.496308333 , 0.232764309 , 44.91597143
+0.496308333 , 0.310352413 , 58.80062857
+0.496308333 , 0.387940516 , 72.81374286
+0.496308333 , 0.465528619 , 86.35077143
+0.496308333 , 0.543116722 , 100.0177714
+0.496308333 , 0.620704825 , 114.3617143
+0.496308333 , 0.698292928 , 129.9911143
+0.496308333 , 0.775881032 , 145.2974286
+0.496308333 , 1.163821547 , 217.9461429
+0.632658333 , 0 , 11.72042857
+0.632658333 , 0.08820644 , 23.60148571
+0.632658333 , 0.176412881 , 37.3784
+0.632658333 , 0.264619321 , 51.78974286
+0.632658333 , 0.352825762 , 66.41602857
+0.632658333 , 0.441032202 , 81.74774286
+0.632658333 , 0.529238642 , 97.67431429
+0.632658333 , 0.617445083 , 113.6398857
+0.632658333 , 0.705651523 , 131.2582
+0.632658333 , 0.793857963 , 149.9599143
+0.632658333 , 0.882064404 , 166.7435143
+0.632658333 , 1.323096606 , 250.1152714
+0.736666667 , 0 , 13.38525714
+0.736666667 , 0.096306151 , 26.25942857
+0.736666667 , 0.192612302 , 41.30197143
+0.736666667 , 0.288918453 , 56.94051429
+0.736666667 , 0.385224604 , 73.018
+0.736666667 , 0.481530756 , 89.5038
+0.736666667 , 0.577836907 , 106.7537714
+0.736666667 , 0.674143058 , 124.4911714
+0.736666667 , 0.770449209 , 144.1737714
+0.736666667 , 0.86675536 , 164.5843429
+0.736666667 , 0.963061511 , 183.3746857
+0.736666667 , 1.444592267 , 275.0620286
+0.84075 , 0 , 15.03257143
+0.84075 , 0.104411703 , 29.1426
+0.84075 , 0.208823405 , 45.27482857
+0.84075 , 0.313235108 , 62.1348
+0.84075 , 0.41764681 , 80.10631429
+0.84075 , 0.522058513 , 97.80674286
+0.84075 , 0.626470215 , 116.1978571
+0.84075 , 0.730881918 , 135.7099429
+0.84075 , 0.83529362 , 157.1857429
+0.84075 , 0.939705323 , 179.0140571
+0.84075 , 1.044117025 , 200.205
+0.84075 , 1.566175538 , 300.3075
+0.944833333 , 0 , 17.17371429
+0.944833333 , 0.112517254 , 32.96025831
+0.944833333 , 0.225034508 , 49.94014826
+0.944833333 , 0.337551762 , 68.57016174
+0.944833333 , 0.450069016 , 88.41034274
+0.944833333 , 0.56258627 , 107.0928913
+0.944833333 , 0.675103523 , 127.4786124
+0.944833333 , 0.787620777 , 148.7749943
+0.944833333 , 0.900138031 , 171.4408158
+0.944833333 , 1.012655285 , 195.0041492
+0.944833333 , 1.125172539 , 218.2316737
+0.944833333 , 1.687758809 , 327.3475105
+1.048841667 , 0 , 20.584314
+1.048841667 , 0.120616965 , 37.55299757
+1.048841667 , 0.241233929 , 55.2541816
+1.048841667 , 0.361850894 , 75.06416997
+1.048841667 , 0.482467859 , 96.68268129
+1.048841667 , 0.603084823 , 117.946008
+1.048841667 , 0.723701788 , 140.1877317
+1.048841667 , 0.844318752 , 163.0461331
+1.048841667 , 0.964935717 , 186.6409877
+1.048841667 , 1.085552682 , 211.0745614
+1.048841667 , 1.206169646 , 235.3837213
+1.048841667 , 1.80925447 , 353.075582
+1.15285 , 0 , 23.99491371
+1.15285 , 0.128716675 , 42.14573683
+1.15285 , 0.257433351 , 60.56821494
+1.15285 , 0.386150026 , 81.5581782
+1.15285 , 0.514866701 , 104.9550198
+1.15285 , 0.643583377 , 128.7991247
+1.15285 , 0.772300052 , 152.8968509
+1.15285 , 0.901016728 , 177.3172719
+1.15285 , 1.029733403 , 201.8411595
+1.15285 , 1.158450078 , 227.1449735
+1.15285 , 1.287166754 , 252.535769
+1.15285 , 1.93075013 , 378.8036535
+1.256858333 , 0 , 27.40551343
+1.256858333 , 0.136816386 , 46.73847609
+1.256858333 , 0.273632772 , 65.88224829
+1.256858333 , 0.410449158 , 88.05218643
+1.256858333 , 0.547265544 , 113.2273584
+1.256858333 , 0.68408193 , 139.6522414
+1.256858333 , 0.820898317 , 165.6059702
+1.256858333 , 0.957714703 , 191.5884107
+1.256858333 , 1.094531089 , 217.0413314
+1.256858333 , 1.231347475 , 243.2153857
+1.256858333 , 1.368163861 , 269.6878167
+1.256858333 , 2.052245791 , 404.531725
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EngineConsumptionMap_PI_Normed.vmap b/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EngineConsumptionMap_PI_Normed.vmap
index 0d001e41be981697c86d41a3f97e7cf928df1892..fc3a96e2a76612adecf6e4031827d004c8f8d401 100644
--- a/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EngineConsumptionMap_PI_Normed.vmap
+++ b/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EngineConsumptionMap_PI_Normed.vmap
@@ -1,155 +1,169 @@
-engine speed , torque , fuel consumption
--0.08 , 0 , 1.281070561
--0.08 , 0.17352 , 4.724945985
--0.08 , 0.34704 , 7.12113949
--0.08 , 0.52056 , 10.26908983
--0.08 , 0.69408 , 13.2754553
--0.08 , 0.8676 , 14.63223437
--0.08 , 1.04112 , 17.31655897
--0.08 , 1.21464 , 20.00088357
--0.08 , 1.38816 , 22.68520817
--0.08 , 1.56168 , 25.36953277
--0.08 , 1.7352 , 28.05385737
-0.03912 , 0 , 1.785514403
-0.03912 , 0.17352 , 5.706519778
-0.03912 , 0.34704 , 8.420120444
-0.03912 , 0.52056 , 11.93490905
-0.03912 , 0.69408 , 15.49442686
-0.03912 , 0.8676 , 17.15847024
-0.03912 , 1.04112 , 20.3719563
-0.03912 , 1.21464 , 23.58544236
-0.03912 , 1.38816 , 26.79892843
-0.03912 , 1.56168 , 30.01241449
-0.03912 , 1.7352 , 33.22590056
-0.15824 , 0 , 2.205694167
-0.15824 , 0.17352 , 6.513364853
-0.15824 , 0.34704 , 10.45224435
-0.15824 , 0.52056 , 13.8791352
-0.15824 , 0.69408 , 16.96052141
-0.15824 , 0.8676 , 20.70168531
-0.15824 , 1.04112 , 24.4303356
-0.15824 , 1.21464 , 28.15898589
-0.15824 , 1.38816 , 31.88763618
-0.15824 , 1.56168 , 35.61628647
-0.15824 , 1.7352 , 39.34493676
-0.27736 , 0 , 2.248609885
-0.27736 , 0.17352 , 7.014365499
-0.27736 , 0.34704 , 11.18511458
-0.27736 , 0.52056 , 15.50407158
-0.27736 , 0.69408 , 18.9852033
-0.27736 , 0.8676 , 22.34718274
-0.27736 , 1.04112 , 26.7306822
-0.27736 , 1.21464 , 31.08281531
-0.27736 , 1.38816 , 35.43494841
-0.27736 , 1.56168 , 39.78708152
-0.27736 , 1.7352 , 44.13921462
-0.396456 , 0 , 2.103031701
-0.396456 , 0.17352 , 7.258840382
-0.396456 , 0.34704 , 11.65905911
-0.396456 , 0.52056 , 16.27931171
-0.396456 , 0.69408 , 20.97835005
-0.396456 , 0.8676 , 24.84639642
-0.396456 , 1.04112 , 28.39387396
-0.396456 , 1.21464 , 33.09327515
-0.396456 , 1.38816 , 37.79267633
-0.396456 , 1.56168 , 42.49207752
-0.396456 , 1.7352 , 47.19147871
-0.527352 , 0 , 2.471029987
-0.527352 , 0.17352 , 8.349737913
-0.527352 , 0.34704 , 13.44106853
-0.527352 , 0.52056 , 18.67999399
-0.527352 , 0.69408 , 24.11207405
-0.527352 , 0.8676 , 28.46131745
-0.527352 , 1.04112 , 32.34773468
-0.527352 , 1.21464 , 37.58074743
-0.527352 , 1.38816 , 42.81376017
-0.527352 , 1.56168 , 48.04677291
-0.527352 , 1.7352 , 53.27978566
-0.6272 , 0 , 2.889261833
-0.6272 , 0.17352 , 9.306087584
-0.6272 , 0.34704 , 14.89838527
-0.6272 , 0.52056 , 20.61579076
-0.6272 , 0.69408 , 26.65037247
-0.6272 , 0.8676 , 31.28839855
-0.6272 , 1.04112 , 35.39006764
-0.6272 , 1.21464 , 40.9884729
-0.6272 , 1.38816 , 46.58687815
-0.6272 , 1.56168 , 52.18528341
-0.6272 , 1.7352 , 57.78368866
-0.72712 , 0 , 3.246398557
-0.72712 , 0.17352 , 10.34201941
-0.72712 , 0.34704 , 16.46032694
-0.72712 , 0.52056 , 22.70891512
-0.72712 , 0.69408 , 29.35895087
-0.72712 , 0.8676 , 34.56642073
-0.72712 , 1.04112 , 38.99393332
-0.72712 , 1.21464 , 45.12686003
-0.72712 , 1.38816 , 51.25978674
-0.72712 , 1.56168 , 57.39271345
-0.72712 , 1.7352 , 63.52564016
-0.82704 , 0 , 3.721472295
-0.82704 , 0.17352 , 11.38474213
-0.82704 , 0.34704 , 17.98675799
-0.82704 , 0.52056 , 24.8752689
-0.82704 , 0.69408 , 32.01254743
-0.82704 , 0.8676 , 37.51079387
-0.82704 , 1.04112 , 42.34495891
-0.82704 , 1.21464 , 48.97198642
-0.82704 , 1.38816 , 55.59901392
-0.82704 , 1.56168 , 62.22604142
-0.82704 , 1.7352 , 68.85306893
-0.926888 , 0 , 4.502697002
-0.926888 , 0.17352 , 12.56627192
-0.926888 , 0.34704 , 19.68422557
-0.926888 , 0.52056 , 27.10351372
-0.926888 , 0.69408 , 34.53788245
-0.926888 , 0.8676 , 40.22106557
-0.926888 , 1.04112 , 45.38305504
-0.926888 , 1.21464 , 52.49376383
-0.926888 , 1.38816 , 59.60447263
-0.926888 , 1.56168 , 66.71518142
-0.926888 , 1.7352 , 73.82589021
-1.026808 , 0 , 5.28392171
-1.026808 , 0.17352 , 13.74780171
-1.026808 , 0.34704 , 21.38169315
-1.026808 , 0.52056 , 29.33175853
-1.026808 , 0.69408 , 37.06321748
-1.026808 , 0.8676 , 42.93133727
-1.026808 , 1.04112 , 48.42115117
-1.026808 , 1.21464 , 56.01554125
-1.026808 , 1.38816 , 63.60993134
-1.026808 , 1.56168 , 71.20432142
-1.026808 , 1.7352 , 78.7987115
-1.126728 , 0 , 6.065146418
-1.126728 , 0.17352 , 14.92933149
-1.126728 , 0.34704 , 23.07916074
-1.126728 , 0.52056 , 31.56000335
-1.126728 , 0.69408 , 39.58855251
-1.126728 , 0.8676 , 45.64160896
-1.126728 , 1.04112 , 51.4592473
-1.126728 , 1.21464 , 59.53731867
-1.126728 , 1.38816 , 67.61539004
-1.126728 , 1.56168 , 75.69346142
-1.126728 , 1.7352 , 83.77153279
-1.226648 , 0 , 6.089397149
-1.226648 , 0.17352 , 16.10735921
-1.226648 , 0.34704 , 25.06638993
-1.226648 , 0.52056 , 34.69587946
-1.226648 , 0.69408 , 43.26828054
-1.226648 , 0.8676 , 48.01774094
-1.226648 , 1.04112 , 56.06951404
-1.226648 , 1.21464 , 63.05909609
-1.226648 , 1.38816 , 71.62084875
-1.226648 , 1.56168 , 80.18260141
-1.226648 , 1.7352 , 88.74435408
-1.326568 , 0 , 7.828693432
-1.326568 , 0.17352 , 17.20854332
-1.326568 , 0.34704 , 27.01598305
-1.326568 , 0.52056 , 36.85856845
-1.326568 , 0.69408 , 43.22300046
-1.326568 , 0.8676 , 50.64725607
-1.326568 , 1.04112 , 67.5775586
-1.326568 , 1.21464 , 72.63368019
-1.326568 , 1.38816 , 82.50142632
-1.326568 , 1.56168 , 92.36917245
-1.326568 , 1.7352 , 102.2369186
\ No newline at end of file
+n_norm , P_norm , FC_norm [(g/h)/P_rated]
+-0.08 , 0 , 6.405352806
+-0.08 , 0.054512916 , 23.62472993
+-0.08 , 0.109025831 , 35.60569745
+-0.08 , 0.163538747 , 51.34544915
+-0.08 , 0.218051663 , 66.37727651
+-0.08 , 0.272564579 , 73.16117186
+-0.08 , 0.327077494 , 86.58279485
+-0.08 , 0.38159041 , 100.0044179
+-0.08 , 0.436103326 , 113.4260409
+-0.08 , 0.490616242 , 126.8476639
+-0.08 , 0.545129157 , 140.2692868
+-0.08 , 0.817693736 , 210.4039303
+0.03912 , 0 , 8.927572014
+0.03912 , 0.068041204 , 28.53259889
+0.03912 , 0.136082409 , 42.10060222
+0.03912 , 0.204123613 , 59.67454524
+0.03912 , 0.272164817 , 77.4721343
+0.03912 , 0.340206022 , 85.79235119
+0.03912 , 0.408247226 , 101.8597815
+0.03912 , 0.47628843 , 117.9272118
+0.03912 , 0.544329634 , 133.9946421
+0.03912 , 0.612370839 , 150.0620725
+0.03912 , 0.680412043 , 166.1295028
+0.03912 , 1.020618065 , 249.1942542
+0.15824 , 0 , 11.02847083
+0.15824 , 0.081569493 , 32.56682426
+0.15824 , 0.163138986 , 52.26122174
+0.15824 , 0.244708479 , 69.39567598
+0.15824 , 0.326277972 , 84.80260703
+0.15824 , 0.407847464 , 103.5084266
+0.15824 , 0.489416957 , 122.151678
+0.15824 , 0.57098645 , 140.7949295
+0.15824 , 0.652555943 , 159.4381809
+0.15824 , 0.734125436 , 178.0814323
+0.15824 , 0.815694929 , 196.7246838
+0.15824 , 1.223542393 , 295.0870257
+0.27736 , 0 , 11.24304942
+0.27736 , 0.095097781 , 35.0718275
+0.27736 , 0.190195563 , 55.92557292
+0.27736 , 0.285293344 , 77.5203579
+0.27736 , 0.380391126 , 94.92601651
+0.27736 , 0.475488907 , 111.7359137
+0.27736 , 0.570586689 , 133.653411
+0.27736 , 0.66568447 , 155.4140765
+0.27736 , 0.760782252 , 177.1747421
+0.27736 , 0.855880033 , 198.9354076
+0.27736 , 0.950977815 , 220.6960731
+0.27736 , 1.426466722 , 331.0441097
+0.396456 , 0 , 10.51515851
+0.396456 , 0.108623344 , 36.29420191
+0.396456 , 0.217246689 , 58.29529554
+0.396456 , 0.325870033 , 81.39655854
+0.396456 , 0.434493378 , 104.8917503
+0.396456 , 0.543116722 , 124.2319821
+0.396456 , 0.651740067 , 141.9693698
+0.396456 , 0.760363411 , 165.4663757
+0.396456 , 0.868986755 , 188.9633817
+0.396456 , 0.9776101 , 212.4603876
+0.396456 , 1.086233444 , 235.9573935
+0.396456 , 1.629350166 , 353.9360903
+0.527352 , 0 , 12.35514994
+0.527352 , 0.123489017 , 41.74868956
+0.527352 , 0.246978033 , 67.20534266
+0.527352 , 0.37046705 , 93.39996995
+0.527352 , 0.493956066 , 120.5603703
+0.527352 , 0.617445083 , 142.3065872
+0.527352 , 0.740934099 , 161.7386734
+0.527352 , 0.864423116 , 187.9037371
+0.527352 , 0.987912132 , 214.0688008
+0.527352 , 1.111401149 , 240.2338646
+0.527352 , 1.234890165 , 266.3989283
+0.527352 , 1.852335248 , 399.5983924
+0.6272 , 0 , 14.44630917
+0.6272 , 0.134828612 , 46.53043792
+0.6272 , 0.269657223 , 74.49192634
+0.6272 , 0.404485835 , 103.0789538
+0.6272 , 0.539314446 , 133.2518624
+0.6272 , 0.674143058 , 156.4419928
+0.6272 , 0.808971669 , 176.9503382
+0.6272 , 0.943800281 , 204.9423645
+0.6272 , 1.078628892 , 232.9343908
+0.6272 , 1.213457504 , 260.926417
+0.6272 , 1.348286116 , 288.9184433
+0.6272 , 2.022429173 , 433.377665
+0.72712 , 0 , 16.23199279
+0.72712 , 0.146176384 , 51.71009706
+0.72712 , 0.292352767 , 82.30163469
+0.72712 , 0.438529151 , 113.5445756
+0.72712 , 0.584705534 , 146.7947544
+0.72712 , 0.730881918 , 172.8321036
+0.72712 , 0.877058301 , 194.9696666
+0.72712 , 1.023234685 , 225.6343001
+0.72712 , 1.169411068 , 256.2989337
+0.72712 , 1.315587452 , 286.9635672
+0.72712 , 1.461763835 , 317.6282008
+0.72712 , 2.192645753 , 476.4423012
+0.82704 , 0 , 18.60736147
+0.82704 , 0.157524155 , 56.92371065
+0.82704 , 0.315048311 , 89.93378994
+0.82704 , 0.472572466 , 124.3763445
+0.82704 , 0.630096622 , 160.0627371
+0.82704 , 0.787620777 , 187.5539694
+0.82704 , 0.945144933 , 211.7247946
+0.82704 , 1.102669088 , 244.8599321
+0.82704 , 1.260193244 , 277.9950696
+0.82704 , 1.417717399 , 311.1302071
+0.82704 , 1.575241555 , 344.2653446
+0.82704 , 2.362862332 , 516.3980169
+0.926888 , 0 , 22.51348501
+0.926888 , 0.16886375 , 62.83135959
+0.926888 , 0.337727501 , 98.42112785
+0.926888 , 0.506591251 , 135.5175686
+0.926888 , 0.675455002 , 172.6894123
+0.926888 , 0.844318752 , 201.1053278
+0.926888 , 1.013182503 , 226.9152752
+0.926888 , 1.182046253 , 262.4688192
+0.926888 , 1.350910004 , 298.0223631
+0.926888 , 1.519773754 , 333.5759071
+0.926888 , 1.688637505 , 369.1294511
+0.926888 , 2.532956257 , 553.6941766
+1.026808 , 0 , 26.41960855
+1.026808 , 0.180211522 , 68.73900853
+1.026808 , 0.360423045 , 106.9084658
+1.026808 , 0.540634567 , 146.6587927
+1.026808 , 0.72084609 , 185.3160874
+1.026808 , 0.901057612 , 214.6566863
+1.026808 , 1.081269135 , 242.1057558
+1.026808 , 1.261480657 , 280.0777063
+1.026808 , 1.44169218 , 318.0496567
+1.026808 , 1.621903702 , 356.0216071
+1.026808 , 1.802115224 , 393.9935575
+1.026808 , 2.703172837 , 590.9903363
+1.126728 , 0 , 30.32573209
+1.126728 , 0.191559294 , 74.64665747
+1.126728 , 0.383118589 , 115.3958037
+1.126728 , 0.574677883 , 157.8000168
+1.126728 , 0.766237178 , 197.9427626
+1.126728 , 0.957796472 , 228.2080448
+1.126728 , 1.149355766 , 257.2962365
+1.126728 , 1.340915061 , 297.6865934
+1.126728 , 1.532474355 , 338.0769502
+1.126728 , 1.72403365 , 378.4673071
+1.126728 , 1.915592944 , 418.8576639
+1.126728 , 2.873389416 , 628.2864959
+1.226648 , 0 , 30.44698575
+1.226648 , 0.202907066 , 80.53679606
+1.226648 , 0.405814133 , 125.3319497
+1.226648 , 0.608721199 , 173.4793973
+1.226648 , 0.811628265 , 216.3414027
+1.226648 , 1.014535332 , 240.0887047
+1.226648 , 1.217442398 , 280.3475702
+1.226648 , 1.420349465 , 315.2954804
+1.226648 , 1.623256531 , 358.1042438
+1.226648 , 1.826163597 , 400.9130071
+1.226648 , 2.029070664 , 443.7217704
+1.226648 , 3.043605995 , 665.5826556
+1.326568 , 0 , 39.14346716
+1.326568 , 0.214254838 , 86.04271662
+1.326568 , 0.428509677 , 135.0799152
+1.326568 , 0.642764515 , 184.2928422
+1.326568 , 0.857019353 , 216.1150023
+1.326568 , 1.071274192 , 253.2362804
+1.326568 , 1.28552903 , 337.887793
+1.326568 , 1.499783868 , 363.1684009
+1.326568 , 1.714038707 , 412.5071316
+1.326568 , 1.928293545 , 461.8458622
+1.326568 , 2.142548383 , 511.1845929
+1.326568 , 3.213822575 , 766.7768893