diff --git a/Data.Simulate.AQUATOX/AQ_Sim_2D.cs b/Data.Simulate.AQUATOX/AQ_Sim_2D.cs index d95ca636..8eb35de0 100644 --- a/Data.Simulate.AQUATOX/AQ_Sim_2D.cs +++ b/Data.Simulate.AQUATOX/AQ_Sim_2D.cs @@ -793,7 +793,8 @@ public void VolFlowFromHAWQS(TVolume TVol, Dictionary Thi foreach (KeyValuePair pair in ThisSeg) { - DischargLoad.list.Add(pair.Key, pair.Value.vals[0] * 86400); //flow from RCH_Daily file -- converted from cms to m3/d + double disch = (pair.Value.vals[0] * 86400 > 0) ? pair.Value.vals[0] * 86400 : 0 ; + DischargLoad.list.Add(pair.Key, disch); //flow from RCH_Daily file -- converted from cms to m3/d } TVol.LoadNotes1 = "Flows from HAWQS converted to m3/day"; @@ -870,7 +871,7 @@ public void VolFlowFromHAWQS(TVolume TVol, Dictionary Thi double COMID_IC = (InitFlow <= 0) ? 0 : ThisSeg[FirstDay].vals[col_OUT] / InitFlow * 0.0115740; // (kg/d) / (m3/s) * (mg/kg * d/s * m3/L) if (isSED) COMID_IC *= 1000; // sed is in units of tons if (isCHLA) COMID_IC = COMID_IC * PPhyto.PAlgalRec.Plant_to_Chla.Val / 1.90; - // mg/L OM = mg/L chl-a C to chl-a g OM / g OC + // mg/L OM = mg/L chl-a C to chl-a g OM / g OC if (SegIndex == 1) TSV.InitialCond = COMID_IC; else TSV.InitialCond = (COMID_IC + TSV.InitialCond * (SegIndex - 1)) / SegIndex; //Average initial condition for all COMIDs within the WBCOMID @@ -1520,7 +1521,7 @@ public string Pass_Data(AQTSim Sim, int SrcID, int ninputs, bool passMass, ref S { totOutVol = totOutVol + Convert.ToDouble(its.Data.Values.ElementAt(i)[0]) * 86400; //fixme potential issue if master setup time-step changes or simulation time-period is increased since NWM data gathering // m3/d m3/d m3/s s/d - frac_this_segment = OutVol / totOutVol; + frac_this_segment = totOutVol > 0 ? OutVol / totOutVol : 1; } double InVol = flowLoad.ReturnLoad(AR.dates[i]); // inflow volume to current segment, If velocity is not used, must be estimated as current seg. outflow @@ -1543,7 +1544,8 @@ public string Pass_Data(AQTSim Sim, int SrcID, int ninputs, bool passMass, ref S double otherSegFlows = previous_flows.Values[i]; //sum of other-segment flows into this segment in this time step double thisSegFlows = OutVol * frac_this_segment; //flows into this segment from passage segment this time step double totFlows = otherSegFlows + thisSegFlows; //total flows into this segment this time step - newlist.Add(AR.dates[i], (TSV.LoadsRec.Loadings.list.Values[i] * otherSegFlows + AR.concs[iTSV][i] * thisSegFlows) / totFlows); //weighted-averaging second or third inputs by volume of water. + double weightavg = totFlows > 0 ? (TSV.LoadsRec.Loadings.list.Values[i] * otherSegFlows + AR.concs[iTSV][i] * thisSegFlows) / totFlows : 0; + newlist.Add(AR.dates[i], weightavg); //weighted-averaging second or third inputs by volume of water. } } } diff --git a/Data.Simulate.AQUATOX/TVolume.cs b/Data.Simulate.AQUATOX/TVolume.cs index b65c148c..bb2e7360 100644 --- a/Data.Simulate.AQUATOX/TVolume.cs +++ b/Data.Simulate.AQUATOX/TVolume.cs @@ -104,6 +104,9 @@ public double Manning_Volume() // AVERAGE FLOW DISCHARGE Q = Discharg / 86400.0; // m3/s // m3/d // s/d + + if (Q < 0) Q = 0; //bullet proof 4/4/2024 + Width = Location.Locale.SurfArea.Val / (Location.Locale.SiteLength.Val * 1000.0); // m // sq.m // km // m/km Y = Math.Pow((Q * Location.ManningCoeff()) / (Math.Sqrt(Location.Locale.Channel_Slope.Val) * Width), 0.6); diff --git a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN.htm b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN.htm index 04f2950b..227480b3 100644 --- a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN.htm +++ b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN.htm @@ -125,11 +125,16 @@ {font-family:"Segoe UI Emoji"; panose-1:2 11 5 2 4 2 4 2 2 3;} @font-face - {font-family:Cambria; - panose-1:2 4 5 3 5 4 6 3 2 4;} + {font-family:"DengXian Light";} @font-face {font-family:Tahoma; panose-1:2 11 6 4 3 5 4 4 2 4;} +@font-face + {font-family:Cambria; + panose-1:2 4 5 3 5 4 6 3 2 4;} +@font-face + {font-family:"Cascadia Mono"; + panose-1:2 11 6 9 2 0 0 2 0 4;} @font-face {font-family:Marlett; panose-1:0 0 0 0 0 0 0 0 0 0;} @@ -887,15 +892,9 @@ @font-face {font-family:"Cascadia Mono SemiLight"; panose-1:2 11 6 9 2 0 0 2 0 4;} -@font-face - {font-family:"Cascadia Mono"; - panose-1:2 11 6 9 2 0 0 2 0 4;} @font-face {font-family:"Cascadia Mono SemiBold"; panose-1:2 11 6 9 2 0 0 2 0 4;} -@font-face - {font-family:"\@MS Mincho"; - panose-1:2 2 6 9 4 2 5 8 3 4;} @font-face {font-family:Abadi;} @font-face @@ -1136,8 +1135,6 @@ {font-family:"Daytona Condensed Light";} @font-face {font-family:"Daytona Light";} -@font-face - {font-family:"DengXian Light";} @font-face {font-family:"Didact Gothic";} @font-face @@ -2893,12 +2890,13 @@ font-weight:bold;} p.MsoToc1, li.MsoToc1, div.MsoToc1 {margin:0in; + margin-bottom:3.0pt; font-size:7.0pt; font-family:"Times New Roman",serif;} p.MsoToc2, li.MsoToc2, div.MsoToc2 {margin-top:6.0pt; margin-right:0in; - margin-bottom:0in; + margin-bottom:3.0pt; margin-left:12.25pt; font-size:11.0pt; font-family:"Arial",sans-serif; @@ -2906,14 +2904,14 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {margin-top:0in; margin-right:0in; - margin-bottom:1.0pt; + margin-bottom:3.0pt; margin-left:20.15pt; font-size:10.0pt; font-family:"Arial",sans-serif;} p.MsoToc4, li.MsoToc4, div.MsoToc4 {margin-top:0in; margin-right:0in; - margin-bottom:1.0pt; + margin-bottom:3.0pt; margin-left:30.25pt; font-size:10.0pt; font-family:"Arial",sans-serif;} @@ -3105,10 +3103,11 @@ padding-bottom:0in;padding-left:0in'>

United States                                                      Office - of Water (4305)                                             Doc Number TBD

+ of Water (4305)                                             Doc Number TBD

Environmental Protection                                                                                                                          Draft - 4/2/2024

+ 4/8/2024

Agency

@@ -3124,8 +3123,7 @@  


AQUATOX - DOT NET AQUATOX DOT NET
(RELEASE 1.0 beta)

 

@@ -3154,37 +3152,22 @@
- - - - - -
-

-
-
-

 

- -

 

 

-


-

 


 

AQUATOX -DOT NET (RELEASE 1.0 beta)

+style='font-size:26.0pt;font-family:"Helvetica",sans-serif;color:black'>AQUATOX +DOT NET

+ +

(RELEASE +1.0 beta)

 

@@ -3300,7 +3286,8 @@

 

-

Date TBD

+

Date TBD

 

@@ -3342,7 +3329,7 @@ not limited to researchers and regulators.  The model described in this document is not required, and the document does not change any legal requirements or impose legally binding requirements on EPA, states, tribes or the regulated -community.  This document has been approved for +community.  This document is pending approval for publication by the Office of Science and Technology, Office of Water, U.S. Environmental Protection Agency.  Mention of trade names, commercial products or organizations does not imply endorsement or recommendation for use.
@@ -3363,7 +3350,8 @@

AQUATOX DOT NET 1.0 (based on AQUATOX 3.2) was developed under contract HHSN316201200013W, Task Order EP-G16H-01256 -with General Dynamics Information Technology Inc.

+with General Dynamics Information Technology Inc. under guidance and direction +from Rajbir Parmar.

 

@@ -3392,40 +3380,40 @@ of Contents:

-

Getting StartedGetting Started. 1

-

AQUATOX:  A Brief OverviewAQUATOX:  A Brief Overview. 1

-

Installation ConsiderationsInstallation Considerations. 2

-

Loading a SimulationLoading a Simulation. 2

-

The Main windowThe Main window. 3

+style='color:windowtext;display:none;text-decoration:none'>2

-

Saving a SimulationSaving a Simulation. 4

-

What is included in an AQUATOX JSON +

What is included in an AQUATOX JSON file?. 4

-

Parameters within Database Files vs. +

Parameters within Database Files vs. Parameters within in a Simulation. 4

-

Exploring State VariablesExploring State Variables. 5

@@ -3439,11 +3427,11 @@

Initial Conditions and Loadings. 6

+style='color:windowtext;display:none;text-decoration:none'>5

Importing Loadings. 7

+style='color:windowtext;display:none;text-decoration:none'>6

Parameters. Plant Data Screen. 14

+style='color:windowtext;display:none;text-decoration:none'>13

Animal Data Screen. 15

-

Site InformationSite Information. 17

+style='color:windowtext;display:none;text-decoration:none'>16

Site Parameters. Remineralization. 19

+style='color:windowtext;display:none;text-decoration:none'>18

Modeling Shade. Mean Depth. 20

+style='color:windowtext;display:none;text-decoration:none'>19

-

Setup ParametersSetup Parameters. 20

+style='color:windowtext;display:none;text-decoration:none'>19

Rate Output 21

-

Run Button (running the model)Run Button (running the model) 22

+style='color:windowtext;display:none;text-decoration:none'>21

Multiple Archived Simulations. 22

+style='color:windowtext;display:none;text-decoration:none'>21

-

Output Window. 22

@@ -3517,33 +3505,33 @@ style='color:windowtext;display:none;text-decoration:none'>. 22

-

Setting Up Simulation, Single SegmentSetting Up Simulation, Single Segment 23

-

Data RequirementsData Requirements. 24

+style='color:windowtext;display:none;text-decoration:none'>23

-

Site Types. 24

-

Starting with a Surrogate SimulationStarting with a Surrogate Simulation. 25

-

Water Volume Modeling OptionsWater Volume Modeling Options. 25

-

Adding a State VariableAdding a State Variable. 25

Adding a Chemical 26

+style='color:windowtext;display:none;text-decoration:none'>25

Adding a Plant 26

-

Using Sediment Bed Models and Data +

Using Sediment Bed Models and Data Requirements. 26

@@ -3567,66 +3555,66 @@

Sediment Diagenesis Model 28

+style='color:windowtext;display:none;text-decoration:none'>27

-

Model CalibrationModel Calibration. 29

+style='color:windowtext;display:none;text-decoration:none'>28

-

Model ValidationModel Validation. 30

+style='color:windowtext;display:none;text-decoration:none'>29

-

Multi-Segment RunsMulti-Segment Runs. 30

-

New Simulation WindowNew Simulation Window. 34

+style='color:windowtext;display:none;text-decoration:none'>32

-

Select Surrogate SimulationSelect Surrogate Simulation. 35

+style='color:windowtext;display:none;text-decoration:none'>32

-

Tutorial 35

+style='color:windowtext;display:none;text-decoration:none'>33

-

Simple Tutorial for a 0-D simulationSimple Tutorial for a 0-D simulation. 35

+style='color:windowtext;display:none;text-decoration:none'>33

Tutorial-- Step 1:  Deleting and Adding a Plant 35

+style='color:windowtext;display:none;text-decoration:none'>33

Tutorial-- Step 2:  Setting an Initial Condition. 35

+style='color:windowtext;display:none;text-decoration:none'>33

Tutorial-- Step 3:  Viewing Parameters in a Simulation. 36

+style='color:windowtext;display:none;text-decoration:none'>34

Tutorial-- Step 4:  Viewing Toxicant Loadings. 38

+style='color:windowtext;display:none;text-decoration:none'>36

Tutorial-- Step 5:  Running the Simulation. 39

+style='color:windowtext;display:none;text-decoration:none'>37

Tutorial-- Step 6:  Viewing Output 40

+style='color:windowtext;display:none;text-decoration:none'>37

-

References. 41

+style='color:windowtext;display:none;text-decoration:none'>38

 

@@ -3760,24 +3748,37 @@

Installation Considerations

-
    -
  • TBA at deployment time.
    • -
+

AQUATOX DOT NET source code was developed in .NET 6.0.  At +this time, the graphical interface for AQUATOX DOT NET is exclusively provided +as a Microsoft Windows Forms application.  However, all technical components of +the model are also being developed as EPA HMS web services. 

-

 

+

For instructions on deployment on a Windows machine, Please +see the “Deployment_Notes” document that in the base directory of the download +files package.
+
+

-

Single-Segment -Mode and Multi-Segment Mode

+

Single-Segment Mode and Multi-Segment Mode

At the time of model startup, a user is prompted as to whether to run the model in single-segment mode or multi-segment mode.

Single-segment mode represents a single well-mixed compartment (0-D) in -which to model nutrients, chemicals, and ecology.  Multi-segment mode represents -many 0-D segments linked together that are then run sequentially.  In -multi-segment mode, data may be imported from the NHD Plus, for stream-network -information, the National Water Model for water flows and lake/reservoir -volumes, and HAWQS/SWAT for nutrients, sediments, and water flows.

+which to model the interrelationships between sediments, nutrients, organic chemicals, +plants, and animals. 

+ +

Multi-segment mode represents many 0-D segments +linked together that are then run sequentially.  In multi-segment mode, data +may be imported from the NHD Plus, for stream-network information, the National +Water Model for water flows and lake/reservoir volumes, and HAWQS/SWAT for nutrients, +sediments, and water flows.

+ +

The user interface of multi-segment mode may also be used to automatically +link to external data sources for single HND Plus lake/reservoir segments or to +run a HAWQS model for a single drainage basin (at USGS HUC8-HUC12 to HAWQS +HUC14 resolution.)

By returning to the initial splash screen and pressing one of the buttons again, Multiple single-segment or multi-segment mode windows may be opened at @@ -3906,13 +3907,14 @@

At the upper right of the interface is a panel showing Databases of Parameter Values.  These databases are not attached to the JSON file and editing these databases will -have no effect on the simulation unless a set of parameters is later loaded from -the database into the simulation.  More information can be found on this in “Parameters within Database Files vs. -Parameters within in a Simulation.”  There are -separate databases for Sites, Animals, Remin. Records (i.e., remineralization -or organic matter parameters), Chemicals, and Plants, respectively  that can be -edited via these buttons and then later imported into a simulation.

+have no effect on the simulation unless a set of parameters is later loaded +from the database into the simulation.  More information can be found on this +in “Parameters within Database +Files vs. Parameters within in a Simulation.”  +There are separate databases for Sites, Animals, Remin. Records (i.e., +remineralization or organic matter parameters), Chemicals, and Plants, +respectively  that can be edited via these buttons and then later imported into +a simulation.

 

@@ -4058,8 +4060,8 @@

Working with Existing -Simulations

+

Working with +Existing Simulations

What is included in an AQUATOX JSON file?

@@ -4342,11 +4344,10 @@

 

-

When working with a system with a -relatively low retention time, such as a segment of a river, loading of -floating biotic state variables such as phytoplankton can be important to -characterize properly.  These loadings are generally entered in units of milligrams -per liter.

+

When working with a system with a relatively +low retention time, such as a segment of a river, loading of floating biotic +state variables such as phytoplankton can be important to characterize properly.  +These loadings are generally entered in units of milligrams per liter.

@@ -4412,9 +4413,9 @@
Im taken directly from the list.  If the execution date of in a simulation occurs between two dates, interpolation is used to determine the correct loading value.  Because of -this interpolation, if the intent is to represent a spike such as from storm runoff -on a particular day, the spike loading should be bracketed by zero (“0") -loadings on the day before and after the spike loading. 

+this interpolation, if the intent is to represent a spike such as from storm +runoff on a particular day, the spike loading should be bracketed by zero +(“0") loadings on the day before and after the spike loading. 

@@ -4572,10 +4573,10 @@
Detrital

Initial conditions and loadings are parsed by specifying % Particulate and % Refractory which can be entered as constant or time-varying -percentages (0–100).  Loadings of organic matter can be constant or -dynamic (time series) for concentrations in inflowing water (mg/L), and for -mass from point sources and non-point sources (g/d).  Toxicants associated -with detritus also can be specified (μg/kg).  

+percentages (0–100).  Loadings of organic matter can be constant or dynamic +(time series) for concentrations in inflowing water (mg/L), and for mass from +point sources and non-point sources (g/d).  Toxicants associated with +detritus also can be specified (μg/kg).  

Organic matter loadings in "inflow water" are closely related to the volume of inflow water specified @@ -4777,6 +4778,7 @@

pH
  • Decomposition of organic matter is affected;
    • +
    @@ -5120,10 +5122,10 @@

  • volatilization,
  • hydrolysis,
  • photolysis,
    • -
  • sorption,
    • -
  • microbial degradation, and
    • -
  • PFA Parameter Screen.
    • +
  • sorption, and
    • +
  • microbial degradation
    • +
     @@ -5580,11 +5583,11 @@

    "Plant Parameters" as well as their manner of referral in the equations of the technical documentation (often a shorter variable name).  -In this way, a user can use this appendix as a reference to search the -technical documentation and find all equations in which each parameter is -utilized.  Advanced users can also easily find the parameters within the -AQUATOX source code as the "internal" variable names are also -listed within Appendix B.

    +In this way, a user can use this appendix as a reference to search the technical +documentation and find all equations in which each parameter is utilized.  +Advanced users can also easily find the parameters within the AQUATOX source +code as the "internal" variable names are also listed within +Appendix B.

     

    @@ -5849,11 +5852,11 @@

    "Animal Parameters" as well as their manner of referral in the equations of the technical documentation (often a shorter variable name).  -In this way, a user can use this appendix as a reference to search the technical -documentation and find all equations in which each parameter is utilized.  -Advanced users can also easily find the parameters within the AQUATOX source -code as the "internal" variable names are also listed within -Appendix B.

    +In this way, a user can use this appendix as a reference to search the +technical documentation and find all equations in which each parameter is +utilized.  Advanced users can also easily find the parameters within the +AQUATOX source code as the "internal" variable names are also +listed within Appendix B.

    See section 4.3 of the technical documentation for extensive discussion of modeling animals within AQUATOX.

    @@ -6627,8 +6630,8 @@

    •       -Mass of Toxicants within State Variables -(normalized to water volume)

    +Mass of Toxicants within State +Variables (normalized to water volume)

    –      @@ -6974,8 +6977,8 @@

    As noted in the Water Volume Data screen, there are many options as to how to compute or specify water volume; each requires a different -set of input data.  Often, the selected volume-modeling option is a function -of the available data for the site being modeled.

    +set of input data.  Often, the selected volume-modeling option is a +function of the available data for the site being modeled.

    Time series of stream volumes are quite rare whereas discharge data are more often available.  For this reason, @@ -7507,16 +7510,16 @@

    Mo

     

    -

    Multi-Segment and Data-Linkage Mode

    AQUATOX DOT NET can model multiple 0-D segments linked together.  In this case, water, nutrients, and biota will flow through pre-defined -(NHDPlusV2) river and lake networks within the continental US.  It can also pull -data from HAWQS/SWAT or the National Water Model for single segment simulations -of hydrologic drainage basins or lakes and reservoirs defined within the NHDPlusV2 -data set.

    +(NHDPlusV2) river and lake networks within the continental US.  It can also +pull data from HAWQS/SWAT or the National Water Model for single segment +simulations of hydrologic drainage basins or lakes and reservoirs defined +within the NHDPlusV2 data set.

     

    @@ -7526,10 +7529,10 @@

    ·         -Stream networks based on NHDPlus flow lines linked together. - These stream networks can include lakes and reservoirs as defined as an NHDPlusV2 -waterbody.  Stream segments are based on USGS COMIDsStream networks based on NHDPlus flow lines linked +together.  These stream networks can include lakes and reservoirs as defined as +an NHDPlusV2 waterbody.  Stream segments are based on USGS COMIDs[1]

    o    -Water flows and water volumes can be automatically imported from the -national water model
    -
    +    Water flows and water volumes can be automatically imported from +the national water model

    -

    When working within the multi-segment window, all model -files are saved in a single working directory.  To start a new simulation, -select New Project.  This will bring up the below.  After the spatial and temporal domain -of the simulation has been set up, and the base simulation selected, clicking -“OK” will exit this screen.  AQUATOX will then ask for a directory in which the -new simulation will be stored.  Either a new folder can be created and -selected, or an existing folder where there is no simulation, or a folder in +

    + +

     

    + +


    +When working within the multi-segment window, all model files are saved in a +single working directory.  To start a new simulation, select New Project.  This +will bring up the New Simulation Window.  After the spatial and +temporal domain of the simulation has been set up, and the base simulation +selected, clicking “OK” will exit this screen.  AQUATOX will then ask for a directory +in which the new simulation will be stored.  Either a new folder can be created +and selected, or an existing folder where there is no simulation, or a folder in which the user does not mind overwriting the existing AQUATOX simulation.

     

    @@ -7618,8 +7626,9 @@

    ·         Show Non-Run Segments – when there is a lake or reservoir within -a simulation some COMID stream segments are superseded by the larger lake/reservoir -polygon.  These segments are plotted when “show non-run segments” is selected.

    +a simulation some COMID stream segments are superseded by the larger +lake/reservoir polygon.  These segments are plotted when “show non-run +segments” is selected.

     

    @@ -7649,9 +7658,9 @@

    a.     Choose -Template (optional): this button brings up the “below Simulation” -interface that shows most of the relevant AQUATOX simulations that can form the -basis of this new model.
    +Template (optional): this button brings up the “Select Surrogate +Simulation” interface that shows most of the relevant AQUATOX +simulations that can form the basis of this new model.

    @@ -7698,16 +7707,15 @@

    -

     

    +

     

    -

    4.     (NWM -chosen) Create Linked Inputs: This button reads water flows and water -velocities from the National Water Model (NWM) and also saves a separate JSON -input simulation for each COMID in the stream network in the base directory -(named AQT_2D_[COMID].JSON).  

    +

    4a. (NWM chosen) +Create Linked Inputs: This button reads water flows and water velocities +from the National Water Model (NWM) and also saves a separate JSON input +simulation for each COMID in the stream network in the base directory (named +AQT_Input_[COMID].JSON).  

    -


    +


    Water flows from one reach to another are imported based on NWM flow data. Note: This process may take several minutes depending on the number of segments in the model and the number of days in which water-flow data needs to be read @@ -7724,9 +7732,10 @@


    -volume (m3) = flow(m3/s) / velocity(m/s) * sitelength (km) -* 0.001 (m/km)
    -
    +More information about model linkage may be found in the section on     Data Linkage Assumptions below.

    + +


    After linked inputs are created, parameters for individual segments may be edited by clicking on the waterbody on the map.  Initial conditions, point-source, and non-point-source loadings may be edited within the interface @@ -7740,20 +7749,18 @@

    -

     

    +

     

    -

    5.     -(NWM Chosen) Overland Flows:  Optional, and stream-network only.  -This button allows the user to specify non-point source loadings for each -segment in a constant g/d for nutrients and organic matter through a matrix -input.  If specified, these inputs will overwrite any other non-point source -loadings in a segment before model execution. 
    +

    5a.  (NWM Chosen) Overland Flows:  Optional, +and stream-network only.  This button allows the user to specify non-point +source loadings for each segment in a constant g/d for nutrients and organic +matter through a matrix input.  If specified, these inputs will overwrite any +other non-point source loadings in a segment before model execution. 

    -

    4.     (HAQS +

    4b. (HAQS Simulation Chosen) Run HAWQS:  This button will first identify the relevant domain for the HAWQS simulation and will then display a dialog that shows the HAWQS API parameters as documented

    -

    6.     (HAWQS Simulation -Chosen) Link HAWQS Data:  This button reads all of the HAWQS linkage data -for water flows, nutrients, and sediment from the completed HAWQS simulation.  -This button will saves a separate JSON input simulation for each COMID in the -stream network in the base directory (named AQT_2D_[COMID].JSON).  

    +

    5b. (HAWQS +Simulation Chosen) Link HAWQS Data:  This button reads all of the HAWQS +linkage data for water flows, nutrients, and sediment from the completed HAWQS +simulation.  This button will saves a separate JSON input simulation for each +COMID in the stream network in the base directory (named AQT_Input_[COMID].JSON).   +

    -


    +


    For lake segments, volume, inflows, and outflows are read from the National Water Model.

     

    +

    More information about model linkage may be +found in the section on Data Linkage Assumptions +below.

    + +

     

    +

    After linked inputs are created, parameters for individual segments may be edited by clicking on the waterbody on the map.  Initial conditions, point-source, and non-point-source loadings may be edited @@ -7788,8 +7801,7 @@

     

    -

    5.     Execute +

    6.   Execute Network:  This button will start the simulation’s execution. 

    For stream networks, each AQUATOX simulation will be run in the order specified @@ -7801,10 +7813,9 @@

    -

     

    +

     

    -

    6.     View +

    7.   View Outputs:  By selecting a state variable from the SV Index drop down box, graphs of all segments over time will be produced.  The CSV button will export a comma-separated value matrix of model results that may be exported into @@ -7816,6 +7827,280 @@

    output window that pertains to the segment selected. 

    +

     

    + +

    Data Linkage Assumptions +and Procedures

    + +

    The “data linkage” button performs different tasks depending +on the data source chosen.

    + +

     

    + +

    First, for every segment in the model simulation, the base +JSON is copied into a unique simulation that will be used for model execution +(file name AQT_Input_[segment_ID].JSON).   Following +linkage and prior to model execution, inputs for each segment may be modified +to some degree, but state variables cannot be added or removed as all segments +must have the same list of state variables.

    + +

     

    + +

    If the National Water Model (NWM) is the source for +linkage data, the following steps are taken:

    + +

     

    + +

    1.     For every +NHD+ waterbody in the segment (lake or reservoir)

    + +

    a.     A web +service request for NWM water volumes and water flows is sent to the EPA “streamflow” +HMS web service.  (note, this call may take up to a minute, depending on the +number of dates in the simulation.)

    + +

    b.     Time-series +water volumes from NWM are copied into the AQUATOX segment and the water-volume +initial condition is set.  (As AQUATOX cannot work with zero water volumes, +the minimum volume for each segment is set to a cross-sectional area of 1m2  +multiplied by the site length in meters)

    + +

    c.     Water +volumes are calculated in AQUATOX using the “known volume” algorithm and the +water-volume time series from NWM.  Inflows are also imported from NWM and are +converted from m3/s to m3/d by multiplying by 86400 s/d.  +

    + +

    d.     The mean +depth is estimated based on the initial-condition water volume and the site’s +surface area.  The maximum depth is set to two times the mean depth as a rough +estimate for now, but this can be modified by the user prior to simulation +execution.

    + +

    2.     For every +stream segment in the simulation (that is not superseded by an NHD+ waterbody)

    + +

    a.     A web +service request for NWM water flows and water velocities is sent to the EPA +“streamflow” HMS web service.  (Note, this call may take up to a minute, +depending on the number of dates in the simulation.)

    + +

    b.     A +time-series set of volumes for each segment is estimated on the basis of NWM +data on flow and velocity. 
    +
    +volume (m3) = flow(m3/s) / velocity(m/s) * sitelength (km) +* 0.001 (m/km)
    +
    +(As AQUATOX cannot work with zero water volumes, the minimum volume for each +segment is set to a cross-sectional area of 1m2  multiplied by the +site length in meters.)
    +
    +

    + +

    3.     Note that +boundary-condition nutrients and organic matter are not available from the +National Water Model so these must be input by the user by editing the +AQT_Input_JSONs.  This can be done by clicking on the stream segment the user +wishes to edit following model linkage.  At that point, the single-segment +interface is available for the user to edit the simulation’s inputs and +parameters.

    + +

     

    + +

    If a HAWQS simulation is the source for linkage data, +the following steps are taken:

    + +

     

    + +

    1.     Data from +the completed HAWQS model is read from a local data file.  Data are passed from +the following HAWQS outputs:

    + +

    a.     “SED” or +sediment concentrations in tons,

    + +

    b.     “NO3” Nitrate +in kg,

    + +

    c.     “NH4” Ammonium +in kg,

    + +

    d.     “MINP” Mineral +phosphorus in kg,  

    + +

    e.     “CHLA,” Chlorophyll-a +in kg,

    + +

    f.      “CBOD” +Carbonaceous biochemical oxygen demand in kg,

    + +

    g.     “DISOX” Dissolved +oxygen in kg,

    + +

    h.     “WTMP” +Water temperature in deg. C.
    +
    +

    + +

    2.     As most of +the data above are in units of kg/d, to convert inflows to mg/L the following +equation is used

    + +

     

    + +

    + + + +

    + +

     

    + +

    where: +

    + +

    CONCCOMP,COMID +            =      concentration +of the component passing into the segment from the upstream segment (mg/L); 

    + +

    COMPIN,COMID                   =      mass of the component passing +into the COMID (kg/d, or metric ton/d for sediment);

    + +

    FLOWIN,COMID                  =      flow of water passing into the +COMID (m3/s)

    + +

    UnitsConversion      =      usually +0.0115740 (mg/kg)(day/sec)(m3/L),  but x1000 for sediment.

    + +

    Chlorophyll a data is assigned to +the first phytoplankton state variable in the simulation list (if it exists).  +Data are converted to organic matter based on the “c-to-chlorophyll a” +parameter for that plant and the assumption that there are 1.90 grams of +organic matter for every gram of carbon.
    +
    +

    + +

    3.     For every +NHD+ waterbody in the simulation (lake or reservoir, if relevant)

    + +

    a.     Water +volumes are read from NHD+ waterbody as shown in NWM Steps 1a-1d above.

    + +

    b.     Inflow and +overland flow data from HAWQS simulations are passed for each NHD+ COMID +flowline leading into or within the NHD+ waterbody.  Data are aggregated and +added to the segment:

    + +

                                              +i.    Overland +flows are input as non-point source loadings.  All loadings to COMIDs located +in the waterbody are summed for each date.

    + +

                                             +ii.    Inflow +loadings are input as boundary-condition inflow loadings.  All boundary +condition loadings to the water body are summed on each date.
    +
    +

    + +

    4.     For every +stream segment in the simulation

    + +

    a.     Stream +geometry and site-specific parameters are read from NHD Plus Catchment SQLite +database.  Parameters added to the segment are

    + +

                                              +i.    Length +(km)

    + +

                                             +ii.    Slope +(m/m)

    + +

                                            +iii.    Latitude +(degrees)

    + +

                                            +iv.    Site +Elevation (m)

    + +

                                             +v.    Channel +Width (m, bankfull)

    + +

                                            +vi.    Channel +Depth (m, bankfull)

    + +

    b.     Daily segment +volumes are estimated based on HAWQS water flows, the geometry data gathered +above, and manning’s equation, assuming a manning’s N of 0.040 s/m1/3 + (the AQUATOX natural channel default).

    + +

    c.     If the +segment is a boundary condition for the modeled system, HAWQS boundary +conditions for sediment, nutrients, gasses, and organic matter are added as +shown in steps 1 and 2 above. 

    + +

    d.     Overland +flows associated with the stream segment are added to the model inputs as time-series +non-point source loadings.

    + +

                                              +i.    Overland +flows are calculated based on the HAWQS “COMPONENT_IN” model result for the +segment which is the sum of overland flows and boundary condition flows.  To +estimate the overland flows alone, the inflow mass of the component from the +up-river segment is subtracted from the “COMPONENT_IN” quantity.

    + +

     

    +

    New Simulation Window

    @@ -7862,11 +8147,11 @@

    +tributaries to the selected pour point (within that number of river +kilometers). Then click “Read Network.”   If valid inputs have been specified, +the selected stream network for the model will be rendered as red lines.  The +total number of stream segments in the model will be displayed under “Selected +Model Domain.”

     

    @@ -8026,7 +8311,7 @@

     

     

    +src="AQUATOX.NET_1.0_UMAN_files/image006.jpg"> 

     

    @@ -8036,7 +8321,7 @@

     

    +src="AQUATOX.NET_1.0_UMAN_files/image007.jpg">

     

    @@ -8088,7 +8373,7 @@

     

    +src="AQUATOX.NET_1.0_UMAN_files/image008.jpg">

     

    @@ -8127,7 +8412,7 @@

     

    +src="AQUATOX.NET_1.0_UMAN_files/image009.jpg">

     

    @@ -8152,7 +8437,7 @@

     

    +src="AQUATOX.NET_1.0_UMAN_files/image010.jpg">

     

    @@ -8173,7 +8458,7 @@

     

    +src="AQUATOX.NET_1.0_UMAN_files/image011.jpg">

     

    @@ -8221,7 +8506,7 @@

     

    +src="AQUATOX.NET_1.0_UMAN_files/image012.jpg">

     

    @@ -8284,7 +8569,7 @@

     

    +src="AQUATOX.NET_1.0_UMAN_files/image013.jpg">

     

    @@ -8326,7 +8611,7 @@

     

    +src="AQUATOX.NET_1.0_UMAN_files/image014.jpg">

     

    @@ -8367,6 +8652,7 @@

    Ambrose, J., Robert B. , J. L. Martin, and T. A. Wool. 2006. WASP7 Benthic Algae - Model Theory and User's Guide, Supplement to Water Quality Analysis Simulation Program (WASP) User @@ -8414,8 +8700,8 @@

    References

    G.W. Heitzman, H.H. Herbrandson, B.H. Indyke, J.R. Loehe, S. Ross, D.D. Sharma, and W.W. Shuster.  1980.  Modeling Transport and Behavior of Pesticides and Other Toxic Organic Materials in Aquatic Environments.  Center for Ecological -Modeling

    Report No. 7.  Rensselaer Polytechnic Institute, Troy, New York.  163 -pp.

    +Modeling Report No. 7.  Rensselaer Polytechnic Institute, Troy, New York.  163 +pp.

    Park, R.A., C.I. Connolly, J.R. Albanese, L.S. Clesceri, G.W. Heitzman, H.H. Herbrandson, B.H. Indyke, J.R. Loehe, S. Ross, D.D. Sharma, @@ -8465,6 +8751,7 @@

    References

     

    +


    diff --git a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image002.jpg b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image002.jpg index 965764be..ee7e5a66 100644 Binary files a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image002.jpg and b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image002.jpg differ diff --git a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image004.gif b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image004.gif new file mode 100644 index 00000000..bdd67cf8 Binary files /dev/null and b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image004.gif differ diff --git a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image005.gif b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image005.gif new file mode 100644 index 00000000..212d8345 Binary files /dev/null and b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image005.gif differ diff --git a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image006.jpg b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image006.jpg index 63636493..cf0a4d51 100644 Binary files a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image006.jpg and b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image006.jpg differ diff --git a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image007.jpg b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image007.jpg index 0b6178c8..bc4d1bdd 100644 Binary files a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image007.jpg and b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image007.jpg differ diff --git a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image008.jpg b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image008.jpg index 03ff0393..0630de49 100644 Binary files a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image008.jpg and b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image008.jpg differ diff --git a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image009.jpg b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image009.jpg index e642b1fb..7d3b5d7d 100644 Binary files a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image009.jpg and b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image009.jpg differ diff --git a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image010.jpg b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image010.jpg index d3d2cb0c..49e60a2e 100644 Binary files a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image010.jpg and b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image010.jpg differ diff --git a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image011.jpg b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image011.jpg index 959b37cd..931c13a0 100644 Binary files a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image011.jpg and b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image011.jpg differ diff --git a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image012.jpg b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image012.jpg index c947b7f4..d3d2cb0c 100644 Binary files a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image012.jpg and b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image012.jpg differ diff --git a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image013.jpg b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image013.jpg new file mode 100644 index 00000000..959b37cd Binary files /dev/null and b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image013.jpg differ diff --git a/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image014.jpg b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image014.jpg new file mode 100644 index 00000000..c947b7f4 Binary files /dev/null and b/GUI/GUI.AQUATOX/Docs/AQUATOX.NET_1.0_UMAN_files/image014.jpg differ diff --git a/GUI/GUI.AQUATOX/MultiSegForm.cs b/GUI/GUI.AQUATOX/MultiSegForm.cs index f992a35b..a32ef8d5 100644 --- a/GUI/GUI.AQUATOX/MultiSegForm.cs +++ b/GUI/GUI.AQUATOX/MultiSegForm.cs @@ -2914,13 +2914,14 @@ void AddHAWQSRchData(long longKey, DateTime dateTimeKey, HAWQSRCHRow data) //ad else //multi-segment HAWQS Read { Dictionary WB_JSONs = new Dictionary(); - if (AQT2D.SN.waterbodies != null) //if there is a NWM lake or reservoir, read volumes and flows from NWM, overland and inflow nutrients will come from HAWQS + if ((AQT2D.SN.waterbodies != null) && //if there is a NWM lake or reservoir, read volumes and flows from NWM, overland and inflow nutrients will come from HAWQS + (AQT2D.SN.waterbodies.wb_table.Length>1)) { TSafeAddToProcessLog("INPUT: Reading Lake-Reservoir Volumes and flows from NWM"); await Task.Run(() => { - for (int i = 1; i < AQT2D.SN.waterbodies.wb_table.Length; i++) + for (int i = 1; i < AQT2D.SN.waterbodies.wb_table.Length; i++) //index 0 is the header { string WBString = AQT2D.SN.waterbodies.wb_table[i][0]; string WBJSON = Read_WB_Water_Flows(WBString, true, msj); //daily volumes and flows from NWM diff --git a/GUI/GUI.AQUATOX/Splash.Designer.cs b/GUI/GUI.AQUATOX/Splash.Designer.cs index a1f32144..856427bd 100644 --- a/GUI/GUI.AQUATOX/Splash.Designer.cs +++ b/GUI/GUI.AQUATOX/Splash.Designer.cs @@ -32,7 +32,9 @@ private void InitializeComponent() panel1 = new System.Windows.Forms.Panel(); pictureBox2 = new System.Windows.Forms.PictureBox(); panel2 = new System.Windows.Forms.Panel(); - Close_Button = new System.Windows.Forms.Button(); + label5 = new System.Windows.Forms.Label(); + SingleSegmentLabel = new System.Windows.Forms.Label(); + Help_Button = new System.Windows.Forms.Button(); MultiSeg = new System.Windows.Forms.Button(); SingleSeg = new System.Windows.Forms.Button(); label4 = new System.Windows.Forms.Label(); @@ -53,7 +55,7 @@ private void InitializeComponent() panel1.Controls.Add(panel2); panel1.Location = new System.Drawing.Point(3, 4); panel1.Name = "panel1"; - panel1.Size = new System.Drawing.Size(464, 270); + panel1.Size = new System.Drawing.Size(468, 308); panel1.TabIndex = 0; panel1.MouseDown += panel1_MouseDown; panel1.MouseMove += panel1_MouseMove; @@ -61,7 +63,7 @@ private void InitializeComponent() // pictureBox2 // pictureBox2.Image = Properties.Resources.x1; - pictureBox2.Location = new System.Drawing.Point(444, 1); + pictureBox2.Location = new System.Drawing.Point(449, 0); pictureBox2.Name = "pictureBox2"; pictureBox2.Size = new System.Drawing.Size(18, 19); pictureBox2.TabIndex = 8; @@ -71,7 +73,9 @@ private void InitializeComponent() // panel2 // panel2.BackColor = System.Drawing.Color.WhiteSmoke; - panel2.Controls.Add(Close_Button); + panel2.Controls.Add(label5); + panel2.Controls.Add(SingleSegmentLabel); + panel2.Controls.Add(Help_Button); panel2.Controls.Add(MultiSeg); panel2.Controls.Add(SingleSeg); panel2.Controls.Add(label4); @@ -81,26 +85,48 @@ private void InitializeComponent() panel2.Controls.Add(pictureBox1); panel2.Location = new System.Drawing.Point(18, 17); panel2.Name = "panel2"; - panel2.Size = new System.Drawing.Size(426, 235); + panel2.Size = new System.Drawing.Size(431, 270); panel2.TabIndex = 1; panel2.MouseDown += panel1_MouseDown; panel2.MouseMove += panel1_MouseMove; // - // Close_Button - // - Close_Button.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 0); - Close_Button.Location = new System.Drawing.Point(339, 194); - Close_Button.Name = "Close_Button"; - Close_Button.Size = new System.Drawing.Size(66, 23); - Close_Button.TabIndex = 7; - Close_Button.Text = "&Close"; - Close_Button.UseVisualStyleBackColor = true; - Close_Button.Click += Close_Click; + // label5 + // + label5.BackColor = System.Drawing.Color.WhiteSmoke; + label5.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, 0); + label5.Location = new System.Drawing.Point(180, 215); + label5.Name = "label5"; + label5.Size = new System.Drawing.Size(165, 46); + label5.TabIndex = 26; + label5.Text = "Create linked segments and/or link to data from NHDPlus, NWM, and HAWQS"; + label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // SingleSegmentLabel + // + SingleSegmentLabel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, 0); + SingleSegmentLabel.Location = new System.Drawing.Point(23, 216); + SingleSegmentLabel.Name = "SingleSegmentLabel"; + SingleSegmentLabel.Size = new System.Drawing.Size(146, 46); + SingleSegmentLabel.TabIndex = 25; + SingleSegmentLabel.Text = "Run one 0-D model segment with nutrients, chemicals, and a food web"; + SingleSegmentLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Help_Button + // + Help_Button.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + Help_Button.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 0); + Help_Button.Location = new System.Drawing.Point(349, 190); + Help_Button.Name = "Help_Button"; + Help_Button.Size = new System.Drawing.Size(53, 23); + Help_Button.TabIndex = 7; + Help_Button.Text = "&Help"; + Help_Button.UseVisualStyleBackColor = true; + Help_Button.Click += Help_Button_Click; // // MultiSeg // MultiSeg.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 0); - MultiSeg.Location = new System.Drawing.Point(177, 194); + MultiSeg.Location = new System.Drawing.Point(186, 190); MultiSeg.Name = "MultiSeg"; MultiSeg.Size = new System.Drawing.Size(144, 23); MultiSeg.TabIndex = 6; @@ -111,7 +137,7 @@ private void InitializeComponent() // SingleSeg // SingleSeg.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 0); - SingleSeg.Location = new System.Drawing.Point(17, 194); + SingleSeg.Location = new System.Drawing.Point(22, 190); SingleSeg.Name = "SingleSeg"; SingleSeg.Size = new System.Drawing.Size(144, 23); SingleSeg.TabIndex = 5; @@ -123,7 +149,7 @@ private void InitializeComponent() // label4.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 0); label4.ForeColor = System.Drawing.Color.Maroon; - label4.Location = new System.Drawing.Point(61, 105); + label4.Location = new System.Drawing.Point(61, 103); label4.Name = "label4"; label4.Size = new System.Drawing.Size(317, 75); label4.TabIndex = 4; @@ -177,8 +203,7 @@ private void InitializeComponent() // AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - CancelButton = Close_Button; - ClientSize = new System.Drawing.Size(471, 276); + ClientSize = new System.Drawing.Size(474, 316); Controls.Add(panel1); FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; Icon = (System.Drawing.Icon)resources.GetObject("$this.Icon"); @@ -205,7 +230,9 @@ private void InitializeComponent() private System.Windows.Forms.Label label2; private System.Windows.Forms.Button SingleSeg; private System.Windows.Forms.Button MultiSeg; - private System.Windows.Forms.Button Close_Button; private System.Windows.Forms.PictureBox pictureBox2; + private System.Windows.Forms.Button Help_Button; + private System.Windows.Forms.Label SingleSegmentLabel; + private System.Windows.Forms.Label label5; } } \ No newline at end of file diff --git a/GUI/GUI.AQUATOX/Splash.cs b/GUI/GUI.AQUATOX/Splash.cs index e90592e5..1a6d02a7 100644 --- a/GUI/GUI.AQUATOX/Splash.cs +++ b/GUI/GUI.AQUATOX/Splash.cs @@ -1,15 +1,9 @@ using AQUATOX.AQSim_2D; using Newtonsoft.Json; using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; using System.Drawing; using System.IO; -using System.Linq; using System.Reflection; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; using static AQUATOX.AQSim_2D.AQSim_2D; @@ -106,5 +100,11 @@ private void Splash_Shown(object sender, EventArgs e) Directory.SetCurrentDirectory(exeDirectory); AQTMainForm.defaultBrowser = Properties.Settings.Default.BrowserExe; } + + private void Help_Button_Click(object sender, EventArgs e) + { + string target = "splash"; + AQTMainForm.OpenUrl(target); + } } } diff --git a/Web.Services/Web.Services.csproj b/Web.Services/Web.Services.csproj index ee2faba1..68430553 100644 --- a/Web.Services/Web.Services.csproj +++ b/Web.Services/Web.Services.csproj @@ -5,7 +5,7 @@ false ..\docker-compose.dcproj Linux - AnyCPU + x64