Added Ads/Des and Scour/Dep or PO4 and TAM

1. Worked on scatter graphs to improve plotting the graph. It may still need work.
2. Started adding the function for Checking the Diurnal pattern.
3. Updated the install.txt. Will compile this version and send to Mark Evenson.

Author: mishranurag-dev

HSPEXP/CookieCutterGraphs.vb

@@ -41,8 +41,7 @@ Public Module CookieCutterGraphs
         Dim lLocations As New atcCollection
         Dim lScenarioResults As New atcDataSource
 
-        Dim lWDMDataSource As atcDataSource
-
+        Dim lWDMDataSource As New atcDataSource
 
         For i As Integer = 0 To aHSPFUCI.FilesBlock.Count
             If aHSPFUCI.FilesBlock.Value(i).Typ = "BINO" Then
@@ -80,7 +79,7 @@ Public Module CookieCutterGraphs
                         Dim lTimeSeries As atcTimeseries = Nothing
                         Dim lFoundTheTimeSeriesinWDMFile As Boolean = False
 
-                        lTimeSeries = LocateTheTimeSeries(lDataSource, aHSPFUCI, lRchId, "PLANK", "BALCLA", 4, 1, lFoundTheTimeSeriesinWDMFile)
+                        lTimeSeries = LocateTheTimeSeries(aHSPFUCI, lRchId, "PLANK", "BALCLA", 4, 1, lFoundTheTimeSeriesinWDMFile)
 
                         If lFoundTheTimeSeriesinWDMFile = False Then
                             'Reading the required time series from Binary file and resetting the flag to false
@@ -97,7 +96,7 @@ Public Module CookieCutterGraphs
                             lTimeseriesGroup.Add(lTimeSeries)
                         End If
 
-                        lTimeSeries = LocateTheTimeSeries(lDataSource, aHSPFUCI, lRchId, "PLANK", "PHYCLA", 1, 1, lFoundTheTimeSeriesinWDMFile)
+                        lTimeSeries = LocateTheTimeSeries(aHSPFUCI, lRchId, "PLANK", "PHYCLA", 1, 1, lFoundTheTimeSeriesinWDMFile)
 
                         If lFoundTheTimeSeriesinWDMFile = False Then
                             lTimeSeries = lScenarioResults.DataSets.FindData("Location", RCHRES).FindData("Constituent", "PHYCLA")(0)
@@ -112,7 +111,7 @@ Public Module CookieCutterGraphs
                             lTimeseriesGroup.Add(lTimeSeries)
                         End If
 
-                        lTimeSeries = LocateTheTimeSeries(lDataSource, aHSPFUCI, lRchId, "NUTRX", "DNUST", 4, 1, lFoundTheTimeSeriesinWDMFile)
+                        lTimeSeries = LocateTheTimeSeries(aHSPFUCI, lRchId, "NUTRX", "DNUST", 4, 1, lFoundTheTimeSeriesinWDMFile)
                         If lFoundTheTimeSeriesinWDMFile = False Then
                             lTimeSeries = lScenarioResults.DataSets.FindData("Location", RCHRES).FindData("Constituent", "PO4-CONCDIS")(0)
 
@@ -127,7 +126,7 @@ Public Module CookieCutterGraphs
                                 lTimeseriesGroup.Add(lTimeSeries)
                             End If
 
-                        lTimeSeries = LocateTheTimeSeries(lDataSource, aHSPFUCI, lRchId, "NUTRX", "DNUST", 2, 1, lFoundTheTimeSeriesinWDMFile)
+                        lTimeSeries = LocateTheTimeSeries(aHSPFUCI, lRchId, "NUTRX", "DNUST", 2, 1, lFoundTheTimeSeriesinWDMFile)
                         If lFoundTheTimeSeriesinWDMFile = False Then
                             lTimeSeries = lScenarioResults.DataSets.FindData("Location", RCHRES).FindData("Constituent", "TAM-CONCDIS")(0)
                         End If
@@ -141,7 +140,7 @@ Public Module CookieCutterGraphs
                                 lTimeseriesGroup.Add(lTimeSeries)
                             End If
 
-                        lTimeSeries = LocateTheTimeSeries(lDataSource, aHSPFUCI, lRchId, "NUTRX", "DNUST", 1, 1, lFoundTheTimeSeriesinWDMFile)
+                        lTimeSeries = LocateTheTimeSeries(aHSPFUCI, lRchId, "NUTRX", "DNUST", 1, 1, lFoundTheTimeSeriesinWDMFile)
                         If lFoundTheTimeSeriesinWDMFile = False Then
                             lTimeSeries = lScenarioResults.DataSets.FindData("Location", RCHRES).FindData("Constituent", "NO3-CONCDIS")(0)
                         End If
@@ -215,7 +214,7 @@ Public Module CookieCutterGraphs
 #Region "Plotting TSS Curve"
 
                             lTimeseriesGroup = New atcTimeseriesGroup
-                        lTimeSeries = LocateTheTimeSeries(lDataSource, aHSPFUCI, lRchId, "HYDR", "RO", 1, 1, lFoundTheTimeSeriesinWDMFile)
+                        lTimeSeries = LocateTheTimeSeries(aHSPFUCI, lRchId, "HYDR", "RO", 1, 1, lFoundTheTimeSeriesinWDMFile)
                         If lFoundTheTimeSeriesinWDMFile = False Then
                             lTimeSeries = lScenarioResults.DataSets.FindData("Location", RCHRES).FindData("Constituent", "RO")(0)
                         End If
@@ -229,7 +228,7 @@ Public Module CookieCutterGraphs
                             lTimeseriesGroup.Add(lTimeSeries)
                         End If
 
-                        lTimeSeries = LocateTheTimeSeries(lDataSource, aHSPFUCI, lRchId, "SEDTRN", "SSED", 4, 1, lFoundTheTimeSeriesinWDMFile)
+                        lTimeSeries = LocateTheTimeSeries(aHSPFUCI, lRchId, "SEDTRN", "SSED", 4, 1, lFoundTheTimeSeriesinWDMFile)
 
                         If lFoundTheTimeSeriesinWDMFile = False Then
                             lTimeSeries = lScenarioResults.DataSets.FindData("Location", RCHRES).FindData("Constituent", "SSED-TOT")(0)
@@ -244,7 +243,7 @@ Public Module CookieCutterGraphs
                                 lTimeSeries.Attributes.SetValue("YAxis", "Left")
                                 lTimeseriesGroup.Add(lTimeSeries)
                             End If
-                        lTimeSeries = LocateTheTimeSeries(lDataSource, aHSPFUCI, lRchId, "SEDTRN", "BEDDEP", 1, 1, lFoundTheTimeSeriesinWDMFile)
+                        lTimeSeries = LocateTheTimeSeries(aHSPFUCI, lRchId, "SEDTRN", "BEDDEP", 1, 1, lFoundTheTimeSeriesinWDMFile)
                         If lFoundTheTimeSeriesinWDMFile = False Then
                             lTimeSeries = lScenarioResults.DataSets.FindData("Location", RCHRES).FindData("Constituent", "BEDDEP")(0)
                         End If
@@ -299,7 +298,7 @@ Public Module CookieCutterGraphs
                         Dim lTimeseriesGroupDO As New atcTimeseriesGroup
                         Dim lTimeSeriesDO As New atcTimeseries(Nothing)
                         Dim lTimeSeriesTimeUnit As Integer
-                        lTimeSeriesDO = LocateTheTimeSeries(lDataSource, aHSPFUCI, lRchId, "OXRX", "DOX", 1, 1, lFoundTheTimeSeriesinWDMFile)
+                        lTimeSeriesDO = LocateTheTimeSeries(aHSPFUCI, lRchId, "OXRX", "DOX", 1, 1, lFoundTheTimeSeriesinWDMFile)
 
                         If lFoundTheTimeSeriesinWDMFile = False OrElse lTimeSeriesTimeUnit < 3 Then
                             lTimeSeriesDO = lScenarioResults.DataSets.FindData("Location", RCHRES).FindData("Constituent", "DOXCONC")(0)
@@ -404,7 +403,7 @@ Public Module CookieCutterGraphs
 
 
                                 lTimeseriesGroup = New atcTimeseriesGroup
-                            lTimeSeries = LocateTheTimeSeries(lDataSource, aHSPFUCI, lRchId, "HYDR", "IVOL", 1, 1, lFoundTheTimeSeriesinWDMFile)
+                            lTimeSeries = LocateTheTimeSeries(aHSPFUCI, lRchId, "HYDR", "IVOL", 1, 1, lFoundTheTimeSeriesinWDMFile)
                             If lFoundTheTimeSeriesinWDMFile = False Then
                                 lTimeSeries = lScenarioResults.DataSets.FindData("Location", RCHRES).FindData("Constituent", "IVOL")(0)
                             End If
@@ -418,7 +417,7 @@ Public Module CookieCutterGraphs
                                     lTimeseriesGroup.Add(lTimeSeries)
                                 End If
                             End If
-                            lTimeSeries = LocateTheTimeSeries(lDataSource, aHSPFUCI, lRchId, "PLANK", "TPKIF", 5, 1, lFoundTheTimeSeriesinWDMFile)
+                            lTimeSeries = LocateTheTimeSeries(aHSPFUCI, lRchId, "PLANK", "TPKIF", 5, 1, lFoundTheTimeSeriesinWDMFile)
                             If lFoundTheTimeSeriesinWDMFile = False Then
                                 lTimeSeries = lScenarioResults.DataSets.FindData("Location", RCHRES).FindData("Constituent", "P-TOT-IN")(0)
                             End If
@@ -460,7 +459,7 @@ Public Module CookieCutterGraphs
                                 Logger.Dbg("Generated graph " & lOutputFolder & "LoadDurationTP_RCHRES_" & lRchId & ".png")
                             End If
 
-                            End If
+                        End If
 
 
 
@@ -482,10 +481,11 @@ Public Module CookieCutterGraphs
         'Dim lRCH As HspfOperation
 
     End Sub
-    Private Function LocateTheTimeSeries(ByRef aDataSource As atcDataSource, ByVal aHSPFUCI As HspfUci,
+    Friend Function LocateTheTimeSeries(ByVal aHSPFUCI As HspfUci,
                                          ByVal aRCHId As Integer, ByVal aGroupName As String,
                                          ByVal aMemberName As String, ByVal aMemSub1 As Integer,
-                                         ByVal aMemSub2 As Integer, ByRef aFoundTheTS As Boolean)
+                                         ByVal aMemSub2 As Integer, ByRef aFoundTheTS As Boolean) As atcTimeseries
+        Dim lDataSource As New atcDataSource
         Dim aTimeSeries As atcTimeseries = Nothing
         aFoundTheTS = False
         Dim lDataID As Integer = 0
@@ -498,10 +498,10 @@ Public Module CookieCutterGraphs
                 For i As Integer = 0 To aHSPFUCI.FilesBlock.Count
                     If aHSPFUCI.FilesBlock.Value(i).Typ = lconnection.Target.VolName Then
                         Dim lFileName As String = AbsolutePath(aHSPFUCI.FilesBlock.Value(i).Name.Trim, CurDir())
-                        aDataSource = atcDataManager.DataSourceBySpecification(lFileName)
-                        If aDataSource Is Nothing Then
+                        lDataSource = atcDataManager.DataSourceBySpecification(lFileName)
+                        If lDataSource Is Nothing Then
                             If atcDataManager.OpenDataSource(lFileName) Then
-                                aDataSource = atcDataManager.DataSourceBySpecification(lFileName)
+                                lDataSource = atcDataManager.DataSourceBySpecification(lFileName)
                             End If
                         End If
                         Exit For
@@ -512,7 +512,7 @@ Public Module CookieCutterGraphs
             End If
         Next lconnection
         If lDataID > 0 Then
-            aTimeSeries = aDataSource.DataSets.FindData("ID", lDataID)(0)
+            aTimeSeries = lDataSource.DataSets.FindData("ID", lDataID)(0)
             aFoundTheTS = True
         End If
 

HSPEXP/HSPFOutputReports.vb

@@ -1669,6 +1669,38 @@ Module HSPFOutputReports
         myHtmlFile = myBuilder.ToString()
         Return myHtmlFile
     End Function
+    Private Function CheckDiurnalPattern(ByVal aBinaryData As atcDataSource, ByVal aUCI As HspfUci, ByVal aConstituent As String) As String
+        Dim lDiurnalPattern As New Text.StringBuilder
+        Dim lFoundTheTS As Boolean = False
+        Dim lGroupName As String = ""
+        Dim lMemberName As String = ""
+        Dim lMemSub1 As Integer = 0
+        Dim lMemSub2 As Integer = 0
+        Select Case aConstituent
+            Case "DO"
+                lGroupName = "OXRX"
+                lMemberName = "DOX"
+                lMemSub1 = 1
+                lMemSub2 = 1
+            Case "Water Temperature"
+                lGroupName = "OXRX"
+                lMemberName = "DOX"
+                lMemSub1 = 1
+                lMemSub2 = 1
+        End Select
+        For Each lRCHRES As HspfOperation In aUCI.OpnBlks("RCHRES").Ids
+
+            LocateTheTimeSeries(aUCI, lRCHRES.Id, lGroupName, lMemberName, lMemSub1, lMemSub2, lFoundTheTS)
+
+
+
+        Next
+
+
+
+
+        Return lDiurnalPattern.ToString
+    End Function
 End Module
 
 

HSPEXP/install.txt

@@ -6,6 +6,8 @@ Features:
 Bugs Fixed:
 1. The expert statistic calculated the years of simulation as an integer. This skewed calculations for models with very small model span. That has been fixed.
 2. The location of help file was not coded properly in the previous version. That has been fixed.
+3. The reports did not include adsorption/desorption and scour/deposition of TAM and PO4. That has been fixed.
+4. The reports did not output labile and refractory organic P data for impervious areas. That has been fixed.
 
 Date: 06/15/2018