The WFIUH was modified in order to decrease the computational demand. Now the output discharge is directly computed in hour and not in seconds anymore. The resources and the test cases were updated according to the refactoring.

Author: Mariolina88

resources/Input/InputRO_1.csv

@@ -11,17 +11,17 @@ Format,yyyy-MM-dd HH:mm,
 ,1997-01-01 03:00,0
 ,1997-01-01 04:00,0
 ,1997-01-01 05:00,0
-,1997-01-01 06:00,1.7190913370310199E-4
-,1997-01-01 07:00,6.147714850909813E-5
-,1997-01-01 08:00,2.1775146247071664E-5
-,1997-01-01 09:00,5.6462244150956575E-6
-,1997-01-01 10:00,1.1684025212621574E-6
-,1997-01-01 11:00,2.1502096814174365E-7
-,1997-01-01 12:00,3.957276326072012E-8
-,1997-01-01 13:00,8.389282796228414E-9
-,1997-01-01 14:00,2.308585433929977E-9
-,1997-01-01 15:00,8.27513862988738E-10
-,1997-01-01 16:00,2.967447954027591E-10
+,1997-01-01 06:00,0
+,1997-01-01 07:00,0
+,1997-01-01 08:00,0
+,1997-01-01 09:00,0
+,1997-01-01 10:00,0
+,1997-01-01 11:00,0
+,1997-01-01 12:00,0
+,1997-01-01 13:00,0
+,1997-01-01 14:00,0
+,1997-01-01 15:00,0
+,1997-01-01 16:00,0
 ,1997-01-01 17:00,1.0644918280178217E-10
 ,1997-01-01 18:00,3.8131026114385236E-11
 ,1997-01-01 19:00,1.3716611180214498E-11

resources/Output/runoff/Q_runoff.csv

@@ -0,0 +1,24 @@
+@T,table
+Created,2017-09-19 16:25
+Author,HortonMachine library
+@H,timestamp,value_1
+ID,,1
+Type,Date,Double
+Format,yyyy-MM-dd HH:mm,
+,1997-01-01 00:00,0.0
+,1997-01-01 01:00,0.0029880398521947463
+,1997-01-01 02:00,0.004235668935120196
+,1997-01-01 03:00,0.004596262334222073
+,1997-01-01 04:00,0.004754539611584759
+,1997-01-01 05:00,0.004430917997229152
+,1997-01-01 06:00,0.004217198476063385
+,1997-01-01 07:00,0.004715793945150948
+,1997-01-01 08:00,0.0034884736314014855
+,1997-01-01 09:00,0.0022409312350462032
+,1997-01-01 10:00,0.001974101021157078
+,1997-01-01 11:00,0.0012111796157117456
+,1997-01-01 12:00,8.422025972651812E-4
+,1997-01-01 13:00,0.0
+,1997-01-01 14:00,0.0
+,1997-01-01 15:00,0.0
+

resources/Output/runoff/Q_runoff_2.csv

@@ -0,0 +1,24 @@
+@T,table
+Created,2017-09-19 16:25
+Author,HortonMachine library
+@H,timestamp,value_1
+ID,,1
+Type,Date,Double
+Format,yyyy-MM-dd HH:mm,
+,1997-01-01 00:00,0.0
+,1997-01-01 01:00,0.013762721939484501
+,1997-01-01 02:00,0.019509222321433862
+,1997-01-01 03:00,0.021170092634595013
+,1997-01-01 04:00,0.021899107729919563
+,1997-01-01 05:00,0.020408527111086167
+,1997-01-01 06:00,0.01942414855914558
+,1997-01-01 07:00,0.02172064764910877
+,1997-01-01 08:00,0.016067688169198246
+,1997-01-01 09:00,0.010321587060089985
+,1997-01-01 10:00,0.00909258402784734
+,1997-01-01 11:00,0.005578616449030558
+,1997-01-01 12:00,0.003879131717188655
+,1997-01-01 13:00,0.0
+,1997-01-01 14:00,0.0
+,1997-01-01 15:00,0.0
+

resources/Output/runoff/Q_runoff_2_1.csv

@@ -69,38 +69,40 @@ public WFIUHKinematic(double [][] widthFunction, double inputFluxes, int inTimes
 
 		// tcorr is the concentration time in seconds
 		int tcorr =(int) widthFunction[widthFunction.length - 1][0];
+		int tcorr_h=tcorr/3600;
 
-		// is the duration of the precipitation in minutes
+		// is the duration of the precipitation in seconds
 		int tpmax =inTimestep*60;
-		tpmax=(tpmax>tcorr)?tcorr:tpmax;
+		int tpmax_h =inTimestep/60;
+		tpmax_h=(tpmax_h>tcorr_h)?tcorr_h:tpmax_h;
 
 
 
 		//is the discharge computed in m^3/s according to the WFIUH at time step i+1 (i1)
-		double[] Q_i1 = new double[(int) tcorr + tpmax + 1];
+		double[] Q_i1 = new double[(int) tcorr_h + tpmax_h + 1];
 
 
-		for( int t = 1; t <= tcorr; t += 1 ) {
+		for( int t = 1; t <= tcorr_h; t += 1 ) {
 
-			if (t <= tpmax) {
+			if (t <= tpmax_h) {
 
-				Q_i1[t]=(double) (inputFluxes* area*ModelsEngine.width_interpolate(widthFunction, t, 0, 2));
+				Q_i1[t]=(double) (inputFluxes* area*ModelsEngine.width_interpolate(widthFunction, t*3600, 0, 2));
 
 
 
 			} else {
-				Q_i1[t]= (double) (inputFluxes *area* (ModelsEngine.width_interpolate(widthFunction, t, 0, 2) - ModelsEngine
-						.width_interpolate(widthFunction, t - tpmax, 0, 2)));
+				Q_i1[t]= (double) (inputFluxes *area* (ModelsEngine.width_interpolate(widthFunction, t*3600, 0, 2) - ModelsEngine
+						.width_interpolate(widthFunction, t*3600 - tpmax, 0, 2)));
 			}
 
 		}
 
 
 
-        for( int t = tcorr; t < (tcorr + tpmax); t += 1 ) {
+        for( int t = tcorr_h; t < (tcorr_h + tpmax_h); t += 1 ) {
 
         	Q_i1[t] = (double) (inputFluxes * area*(widthFunction[widthFunction.length - 1][2] 
-            		- ModelsEngine.width_interpolate(widthFunction, t - tpmax, 0, 2)));
+            		- ModelsEngine.width_interpolate(widthFunction, t*3600 - tpmax, 0, 2)));
         }
 
 

resources/Output/runoff/Q_runoff_3.csv

@@ -160,7 +160,7 @@ public void process() throws Exception {
 			// and its timeStep,  plus the length of the width function/60, since we want minute intervals
 
 			// now is in minutes
-			runoff=new double [(int) widthFunction[widthFunction.length - 1][0] +inTimestep*60 + 1];
+			runoff=new double [(int) widthFunction[widthFunction.length - 1][0]/3600 +inTimestep/60 + 1];
 
 		}
 
@@ -181,16 +181,16 @@ public void process() throws Exception {
 
 		/** The output of the previous computation in the average discharge in 1 minute in m^3/s 
 		 * so we need the compute the hourly average */
-		double Q=computeMean(runoff,inTimestep);
+		//double Q=computeMean(runoff,inTimestep);
 
 		//System.out.println("runoff:"+Q);
-		double Q_mm=Q*conversion/(area);
+		double Q_mm=runoff[0]*conversion/(area);
 
 
 		/** Save the result in  hashmaps for each station*/
-		storeResult_series(ID,alpha*rain,Q,Q_mm);
+		storeResult_series(ID,alpha*rain,runoff[0],Q_mm);
 
-		runoff=computeNewVector(runoff,inTimestep);
+		runoff=computeNewVector(runoff,inTimestep/60);
 
 		step++;
 
@@ -253,7 +253,7 @@ public double computeMean (double [] runoff, int inTimeStep ){
 
 	public double [] computeNewVector (double [] runoff,int inTimeStep){
 
-		inTimeStep=inTimeStep*60;
+		//inTimeStep=inTimeStep*60;
 
 		for (int i=0;i<runoff.length;i++){
 			if (i<runoff.length-inTimeStep){

resources/Output/runoff/Q_runoff_3_1.csv

@@ -19,13 +19,13 @@ public class TestRunoff{
 	public void testLinear() throws Exception {
 
 		String startDate = "1997-01-01 00:00";
-		String endDate = "1997-01-01 05:00";
+		String endDate = "1997-01-01 15:00";
 		int timeStepMinutes = 60;
 		String fId = "ID";
 
 		String inPathToPrec = "resources/Input/InputRO_1.csv";
-		String pathToQ= "resources/Output/runoff/Q_runoff_2_1.csv";
-		String pathToQint= "resources/Output/runoff/Q_runoff_3_1.csv";
+		String pathToQ= "resources/Output/runoff/Q_runoff.csv";
+		String pathToQmm= "resources/Output/runoff/Q_runoff_mm.csv";
 
 
 
@@ -42,7 +42,7 @@ public void testLinear() throws Exception {
 		writerQ.fileNovalue="-9999";
 
 
-		writerQint.file = pathToQint;
+		writerQint.file = pathToQmm;
 		writerQint.tStart = startDate;
 		writerQint.tTimestep = timeStepMinutes;
 		writerQint.fileNovalue="-9999";
@@ -68,17 +68,14 @@ public void testLinear() throws Exception {
 
 
 		while( JReader.doProcess ) {
-		
-			//waterBudgetRunoff.solver_model="dp853";
-			//waterBudgetRunoff.ET_model="AET";
+
 			waterBudgetRunoff.inRescaledDistance=width_sup;
-			waterBudgetRunoff.pCelerity=4;
+			waterBudgetRunoff.pCelerity=0.4;
 			waterBudgetRunoff.inTopindex=topIndex;
 			waterBudgetRunoff.pSat=20;
 			waterBudgetRunoff.inTimestep=timeStepMinutes;
 			waterBudgetRunoff.ID=1;
 			waterBudgetRunoff.alpha=1;
-			//waterBudgetRunoff.s_RunoffMax=4.60;
 
 			JReader.nextRecord();
 
@@ -88,7 +85,7 @@ public void testLinear() throws Exception {
 			waterBudgetRunoff.process();
 
             HashMap<Integer, double[]> outHMDischarge = waterBudgetRunoff.outHMDischarge;
-            HashMap<Integer, double[]> outHMDischargeint = waterBudgetRunoff.outHMDischarge_mm;
+            HashMap<Integer, double[]> outHMDischarge_mm = waterBudgetRunoff.outHMDischarge_mm;
 
 
 			writerQ.inData = outHMDischarge;
@@ -98,10 +95,10 @@ public void testLinear() throws Exception {
 				writerQ.close();
 			}
 
-			writerQint.inData = outHMDischargeint;
+			writerQint.inData = outHMDischarge_mm;
 			writerQint.writeNextLine();
 
-			if (pathToQint != null) {
+			if (pathToQmm != null) {
 				writerQint.close();
 			}