csip-hydraulics Displaying differences for changeset

Displaying differences for changeset

display as Allow wrapping

src/java/hydraulics/ChannelGeometry.java

@@ -4,7 +4,7 @@

import java.util.ArrayList;

/**

-* Last Updated: 13-October-2014

+* Last Updated: 5-February-2016

* @author Tyler Wible

* @since 1-August-2014

@@ -14,9 +14,9 @@

boolean irregularGeometry = false; //Whether the cross-section is regular like trapezoidal, triangular, rectangular (false) or irregular (true)

double bottomWidth = 6.096; //the bottom width of the channel (set to zero for triangular cross-sections, meters)

double sideSlope = 2; //the side slope (z), calculated with a right triangle with a vertical unit of 1 and a horizontal unit of "z"

- double discharge = 11.3267; //discharge in the cross-section (in cubic meters per second, m^3/s) (only used for normal and critical depth calculations)

+ public double discharge = 11.3267; //discharge in the cross-section (in cubic meters per second, m^3/s) (only used for normal and critical depth calculations)

double bedSlope = 0.0016; //channel bed slope (m/m) (only used for normal depth calculations)

- double n = 0.025; //manning's roughness coefficient (only used for normal depth calculations)

+ public double n = 0.025; //manning's roughness coefficient (only used for normal depth calculations)

String crossSection = "x\ty\n0\t3250\n10\t3240\n41.4\t3242\n52.3\t3243\n61.8\t3248\n72\t3241\n84\t3239\n87\t3242\n95\t3248\n123\t3252";//a list of x-y points for the cross section ;

//Global variable (no set needed)

src/java/hydraulics/GeneralFunctions.java

 @@ -27,16 +27,16 @@
    * Borrowed from csip-cfa/DoubleArray
    * Borrowed from csip-cfa/DoubleMath
    * Borrowed from csip-cfa/Graphing
-- * Last Updated: 13-November-2014
++ * Last Updated: 5-February-2016
    * @author Tyler Wible
    * @since 5-August-2012
    */
   public class GeneralFunctions {
       private String fontFamily = "SansSerif";
--    Font titleFont = new Font(fontFamily, Font.BOLD, 30);
--    Font masterFont = new Font(fontFamily, Font.PLAIN, 22);
--    Font DClabelFont = new Font(fontFamily, Font.ITALIC, 20);
--    Font floodLabelFont = new Font(fontFamily, Font.PLAIN, 18);
++    public Font titleFont = new Font(fontFamily, Font.BOLD, 30);
++    public Font masterFont = new Font(fontFamily, Font.PLAIN, 22);
++    public Font DClabelFont = new Font(fontFamily, Font.ITALIC, 20);
++    public Font floodLabelFont = new Font(fontFamily, Font.PLAIN, 18);
       /**
        * Creates a double[] array of the elements in dataArray[all][column]
        * @param dataArray  the double[][] data array

src/java/m/hydraulics/ApplicationConfig.java

 @@ -37,9 +37,9 @@
           resources.add(csip.QueryService.class);
           resources.add(csip.ReportService.class);
           resources.add(csip.UIService.class);
--        resources.add(m.hydraulics.ChannelGeometry_V1_0.class);
--        resources.add(m.hydraulics.EffectiveDischarge_V1_0.class);
           resources.add(m.hydraulics.Sediment_V1_0.class);
--        resources.add(m.hydraulics.StandardStepMethod_V1_0.class);
++        resources.add(m.hydraulics.channelgeometry.V1_0.class);
++        resources.add(m.hydraulics.effectivedischarge.V1_0.class);
++        resources.add(m.hydraulics.standardstep.V1_0.class);
       }
   }