Merge pull request #10 from mcrossley/master

v1.3.0 - CMX v3.20.0 support

Author: mcrossley

CreateMissing.csproj

@@ -3,9 +3,9 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <AssemblyVersion>1.2.1.0</AssemblyVersion>
-    <FileVersion>1.2.1.0</FileVersion>
-    <Version>1.2.1</Version>
+    <AssemblyVersion>1.3.0.1</AssemblyVersion>
+    <FileVersion>1.3.0.1</FileVersion>
+    <Version></Version>
     <StartupObject>CreateMissing.Program</StartupObject>
     <TargetFramework>net48</TargetFramework>
     <Authors>Mark Crossley</Authors>

Cumulus.cs

@@ -28,6 +28,8 @@ class Cumulus
 		public int ChillHourSeasonStart;
 		public double ChillHourThreshold;
 
+		public double CalibRainMult;
+
 		private readonly StationOptions StationOptions = new StationOptions();
 		internal StationUnits Units = new StationUnits();
 		private readonly int[] WindDPlaceDefaults = { 1, 0, 0, 0 }; // m/s, mph, km/h, knots
@@ -55,7 +57,7 @@ public Cumulus()
 
 		private void ReadIniFile()
 		{
-			if (!System.IO.File.Exists("Cumulus.ini"))
+			if (!System.IO.File.Exists(Program.location + "Cumulus.ini"))
 			{
 				Program.LogMessage("Failed to find Cumulus.ini file!");
 				Console.WriteLine("Failed to find Cumulus.ini file!");
@@ -129,6 +131,8 @@ private void ReadIniFile()
 				NOAAcoolingthreshold = Units.Temp == 0 ? 18.3 : 65;
 			}
 
+			CalibRainMult = ini.GetValue("Offsets", "RainMult", 1.0);
+
 			ChillHourSeasonStart = ini.GetValue("Station", "ChillHourSeasonStart", 10);
 			if (ChillHourSeasonStart < 1 || ChillHourSeasonStart > 12)
 				ChillHourSeasonStart = 1;
@@ -162,6 +166,7 @@ public class StationOptions
 		public bool UseZeroBearing { get; set; }
 		public bool UseWind10MinAve { get; set; }
 		public bool UseSpeedForAvgCalc { get; set; }
+		public bool UseSpeedForLatest { get; set; }
 		public bool Humidity98Fix { get; set; }
 		public bool CalculatedDP { get; set; }
 		public bool CalculatedWC { get; set; }

DayFile.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -18,7 +17,7 @@ class DayFile
 		public string FieldSep = string.Empty;
 		public string DateSep = string.Empty;
 
-		private readonly string dayFileName = "data" + Path.DirectorySeparatorChar + "dayfile.txt";
+		private readonly string dayFileName = Program.location + "data" + Path.DirectorySeparatorChar + "dayfile.txt";
 
 		public DayFile()
 		{
@@ -228,8 +227,10 @@ private string RecToCsv(Dayfilerec rec)
 			// 50  High Humidex
 			// 51  Time of high Humidex
 
-			// 52  Low Humidex
-			// 53  Time of low Humidex
+			// 52  Chill hours
+			// 53  High 24 hr rain
+			// 54  Time of high 24 hr rain
+
 
 
 			// Write the date back using the same separator as the source file
@@ -435,7 +436,13 @@ private string RecToCsv(Dayfilerec rec)
 			}
 
 			if (rec.ChillHours != -9999)
-				strb.Append(rec.ChillHours.ToString("F1"));
+				strb.Append(rec.ChillHours.ToString("F1") + FieldSep);
+
+			if (rec.HighRain24h != -9999)
+			{
+				strb.Append(rec.HighRain24h.ToString(Program.cumulus.TempFormat) + FieldSep);
+				strb.Append(rec.HighRain24hTime.ToString("HH:mm"));
+			}
 
 			Program.LogMessage("Dayfile.txt Added: " + datestring);
 
@@ -579,6 +586,13 @@ private Dayfilerec ParseDayFileRec(string data)
 
 				if (st.Count > idx++ && double.TryParse(st[52], out varDbl))
 					rec.ChillHours = varDbl;
+
+				if (st.Count > idx++ && double.TryParse(st[53], out varDbl))
+					rec.HighRain24h = varDbl;
+
+				if (st.Count > idx++ && st[54].Length == 5)
+					rec.HighRain24hTime = Utils.GetDateTime(rec.Date, st[54]);
+
 			}
 			catch (Exception ex)
 			{
@@ -645,6 +659,8 @@ public class Dayfilerec
 		public double HighHumidex;
 		public DateTime HighHumidexTime;
 		public double ChillHours;
+		public double HighRain24h;
+		public DateTime HighRain24hTime;
 
 		public Dayfilerec()
 		{
@@ -679,6 +695,7 @@ public Dayfilerec()
 			LowFeelsLike = 9999;
 			HighHumidex = -9999;
 			ChillHours = -9999;
+			HighRain24h = -9999;
 		}
 
 		public bool HasMissingData()
@@ -687,8 +704,7 @@ public bool HasMissingData()
 				DominantWindBearing == 9999 || LowDewPoint == 9999 || HighDewPoint == -9999 || LowWindChill == 9999 || HighHourlyRain == -9999 ||
 				LowAppTemp == 9999 || HighAppTemp == -9999 || HighHeatIndex == -9999 || HighHumidity == -9999 || LowHumidity == 9999 ||
 				HighAvgWind == -9999 || AvgTemp == -9999 || HighRainRate == -9999 || LowPress == 9999 || HighPress == -9999 ||
-				HighTemp == -9999 || LowTemp == 9999 || HighGust == -9999 || ChillHours == -9999
-			)
+				HighTemp == -9999 || LowTemp == 9999 || HighGust == -9999 || ChillHours == -9999 || HighRain24h == -9999)
 			{
 				return true;
 			}

LogicFlow.txt

@@ -0,0 +1,43 @@
+
+
+StartDate
+
+CurrentDate = StartDate
+
+// process each dayfile record we have at the start
+ForEach dayfile record
+{
+    if record > CurrentDate
+    {
+        while record > CurrentDate
+        {
+            Get new rec from logfile
+            if we get a record from log file
+                Update rec with Solar from log
+
+            increment CurrentDate
+        }
+
+        decrement CurrentDate
+    }
+    else
+    {
+        if record has missing data
+            Get missing data from log file
+    }
+
+    increment CurrentDate
+}
+
+// now add any missing records at the end
+While CurrentDate < EndDate
+{
+    Get record from logfile
+    if we get a record from log file
+        Update rec with Solar from log
+
+    increment CurrentDate
+}
+
+
+Save the dayfile