Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/respec/BASINS
Browse files Browse the repository at this point in the history
  • Loading branch information
PaulHummelRESPEC committed Mar 13, 2018
2 parents 59ace99 + f0b7ea3 commit 812bcce
Show file tree
Hide file tree
Showing 29 changed files with 3,049 additions and 446 deletions.
2 changes: 1 addition & 1 deletion HSPEXP/HSPEXP+-D4EM10_common.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<WebPage>index.htm</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.30.0.0</ApplicationVersion>
<ApplicationVersion>2.0.0.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>
Expand Down
60 changes: 35 additions & 25 deletions HSPEXP/HSPFOutputReports.vb
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,28 @@ Module HSPFOutputReports
pConstituents.Add("Heat")
End If


If StartUp.chkFecalColiform.Checked Then
pConstituents.Add("FColi")
If StartUp.chkGQUAL1.Checked Then
pConstituents.Add(StartUp.chkGQUAL1.Text & "-1")
End If
If StartUp.chkGQUAL2.Checked Then
pConstituents.Add(StartUp.chkGQUAL2.Text & "-2")
End If
If StartUp.chkGQUAL3.Checked Then
pConstituents.Add(StartUp.chkGQUAL3.Text & "-3")
End If
If StartUp.chkGQUAL4.Checked Then
pConstituents.Add(StartUp.chkGQUAL4.Text & "-4")
End If
If StartUp.chkGQUAL5.Checked Then
pConstituents.Add(StartUp.chkGQUAL5.Text & "-5")
End If
If StartUp.chkGQUAL6.Checked Then
pConstituents.Add(StartUp.chkGQUAL6.Text & "-6")
End If
If StartUp.chkGQUAL7.Checked Then
pConstituents.Add(StartUp.chkGQUAL7.Text & "-7")
End If

'set up the timeseries attributes for statistics
atcTimeseriesStatistics.atcTimeseriesStatistics.InitializeShared()

Expand Down Expand Up @@ -442,6 +460,7 @@ Module HSPFOutputReports
Dim lConstituentName As String = ""
Dim lActiveSections As New List(Of String)
Dim CheckQUALID As Boolean = False
Dim lGQALID As Integer = 0
Select Case lConstituent
Case "Water"
lConstituentName = "WAT"
Expand Down Expand Up @@ -491,29 +510,18 @@ Module HSPFOutputReports
lActiveSections.Add("OXRX")
lActiveSections.Add("NUTRX")
lActiveSections.Add("PLANK")
Case "FColi"
lConstituentName = "FColi"
Case Else
lGQALID = Right(lConstituent, 1)
lConstituentName = SafeSubstring(lConstituent, 0, lConstituent.Length - 2)
lConstProperties = Utility.LocateConstituentNames(aHspfUci, lConstituentName, lGQALID)
lActiveSections.Add("PQUAL")
lActiveSections.Add("IQUAL")
lActiveSections.Add("GQUAL")

End Select

Dim lScenarioResults As New atcDataSource
'If lOpenHspfBinDataSource.DataSets.Count > 1 Then
' Dim lConstituentsToOutput As atcCollection = Utility.ConstituentsToOutput(lConstituent, lConstProperties)
' For Each ConstituentForAnalysis As String In lConstituentsToOutput.Keys
' Dim OpnType As String = SafeSubstring(ConstituentForAnalysis, 0, 2)
' ConstituentForAnalysis = SafeSubstring(ConstituentForAnalysis, 2)
' If Not OpnType = "R:" AndAlso (ConstituentForAnalysis.EndsWith("1") Or ConstituentForAnalysis.EndsWith("2")) Then

' ConstituentForAnalysis = Left(ConstituentForAnalysis, ConstituentForAnalysis.Length - 1)
' End If
' lScenarioResults.DataSets.Add(atcDataManager.DataSets.FindData("Constituent", ConstituentForAnalysis))

' Next

'End If


If lScenarioResults.DataSets.Count = 0 Then
For Each activeSection As String In lActiveSections
lScenarioResults.DataSets.Add(atcDataManager.DataSets.FindData("Section", activeSection))
Expand All @@ -527,13 +535,15 @@ Module HSPFOutputReports
lReportCons = Nothing
Dim lOutFileName As String = ""

LandLoadingReports(loutfoldername, lScenarioResults, aHspfUci, pBaseName, lRunMade, lConstituent, lConstProperties, SDateJ, EDateJ)
ReachBudgetReports(loutfoldername, lScenarioResults, aHspfUci, pBaseName, lRunMade, lConstituent, lConstProperties, SDateJ, EDateJ)
LandLoadingReports(loutfoldername, lScenarioResults, aHspfUci, pBaseName, lRunMade, lConstituentName, lConstProperties, SDateJ, EDateJ, lGQALID)
ReachBudgetReports(loutfoldername, lScenarioResults, aHspfUci, pBaseName, lRunMade, lConstituentName, lConstProperties, SDateJ, EDateJ, lGQALID)
Logger.Status(Now & " Generating Reports for " & lConstituent)
Logger.Dbg(Now & " Generating Reports for " & lConstituent)
lReportCons = Nothing

If Not (lConstituent = "DO" Or lConstituent = "Heat" Or lConstituent = "BOD-Labile") Then
If lConstituent = "TotalN" OrElse lConstituent = "TotalP" OrElse
lConstituent = "Sediment" OrElse lConstituent = "Water" Then

With HspfSupport.ConstituentBudget.Report(aHspfUci, lConstituent, lOperationTypes, pBaseName,
lScenarioResults, pOutputLocations, lRunMade, SDateJ, EDateJ, lConstProperties)
lReportCons = .Item1
Expand Down Expand Up @@ -605,8 +615,8 @@ Module HSPFOutputReports


Else
Logger.Dbg("The HBN file didn't have any data for the constituent " & lConstituent & " therefore the balance reports for " &
lConstituent & " will not be generated. Make sure that HSPF run completed last time.")
Logger.Dbg("The HBN file didn't have any data for the constituent " & lConstituent & " therefore the balance reports for " &
lConstituent & " will not be generated. Make sure that HSPF run completed last time.")
Dim ans As Integer
ans = MsgBox("HBN files do not have any data. Constituent Balance reports will not be generated. " &
"Did uci file run properly last time?")
Expand Down
4 changes: 2 additions & 2 deletions HSPEXP/My Project/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("1.40.0.0")>
<Assembly: AssemblyFileVersion("1.40.0.0")>
<Assembly: AssemblyVersion("2.00.0.0")>
<Assembly: AssemblyFileVersion("2.00.0.0")>
<Assembly: NeutralResourcesLanguage("en-US")>
4 changes: 2 additions & 2 deletions HSPEXP/SetUpScript.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "HSPEXP+"
#define MyAppVersion "1.40beta7"
#define MyAppVersion "2.00beta"
#define MyAppPublisher "RESPEC"
#define MyAppURL "http://www.respec.com/product/hspexp/"
#define MyAppExeName "HSPEXP+.exe"
Expand All @@ -21,7 +21,7 @@ AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DefaultDirName={reg:HKLM\SOFTWARE\RESPEC\BASINS41,Base Directory|{pf}\HSPEXP+}
DefaultGroupName={#MyAppName}
OutputBaseFilename=HSPEXP+1.40beta7SetUp
OutputBaseFilename=HSPEXP+2.00betaSetUp
Compression=lzma
SolidCompression=yes
InfoBeforeFile=install.txt
Expand Down
2 changes: 1 addition & 1 deletion HSPEXP/SplashScreen1.vb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
' Version.Text = System.String.Format(Version.Text, My.Application.Info.Version.Major, My.Application.Info.Version.Minor, My.Application.Info.Version.Build, My.Application.Info.Version.Revision)

With My.Application.Info.Version
Version.Text = "Version " & .Major & "." & .Minor & " beta7"
Version.Text = "Version " & .Major & "." & .Minor & " beta"
If .MajorRevision > 0 OrElse .MinorRevision > 0 Then
Version.Text &= "." & .MajorRevision & "." & .MinorRevision
End If
Expand Down
Loading

0 comments on commit 812bcce

Please sign in to comment.