Change name of variable rheology to closureEquation.

niccolotubini · niccolotubini · commit 74ee07aee607 · 2020-11-23T14:58:22.000+01:00
diff --git a/src/main/java/it/geoframe/blogspot/closureequation/closureequation/SoilWaterRetentionCurveFactory.java b/src/main/java/it/geoframe/blogspot/closureequation/closureequation/SoilWaterRetentionCurveFactory.java
@@ -41,6 +41,8 @@ public ClosureEquation create(String model) {
 			myModel = new SWRCRomano();
 		}else if(model.equalsIgnoreCase("Water Depth") || model.equalsIgnoreCase("WaterDepth")) {
 			myModel = new WaterDepth();
+		}else if(model.equalsIgnoreCase("None") || model.equalsIgnoreCase("")) {
+			myModel = new NoneClosureEquation();
 		}else {
 			System.out.println("\n\n\tERROR: please check swrcModel name.");
 		}
diff --git a/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/ConductivityEquation.java b/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/ConductivityEquation.java
@@ -31,10 +31,10 @@
  */
 public abstract class ConductivityEquation {
 	
-	protected ClosureEquation rheology;
+	protected ClosureEquation closureEquation;
 	
-	public ConductivityEquation(ClosureEquation rheology) {
-		this.rheology = rheology;
+	public ConductivityEquation(ClosureEquation closureEquation) {
+		this.closureEquation = closureEquation;
 	}
 	
 	public abstract double k(double x, int id, int element);
diff --git a/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/ConductivityEquationFactory.java b/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/ConductivityEquationFactory.java
@@ -24,21 +24,25 @@
 public class ConductivityEquationFactory {
 	
 	
-	public ConductivityEquation create(String model, ClosureEquation rheologyModel) {
+	public ConductivityEquation create(String model, ClosureEquation closureEquation) {
 		
 		ConductivityEquation myModel = null;
 		
 		if(model.equalsIgnoreCase("Johansen")) {
-			myModel = new Johansen(rheologyModel);
+			myModel = new Johansen(closureEquation);
 		} else if (model.equalsIgnoreCase("Mualem Van Genuchten") || model.equalsIgnoreCase("MualemVanGenuchten") || model.equalsIgnoreCase("Mualem VG") ) {
-			myModel = new MualemVanGenuchten(rheologyModel);
+			myModel = new MualemVanGenuchten(closureEquation);
 		} else if (model.equalsIgnoreCase("Mualem Brooks Corey") || model.equalsIgnoreCase("MualemBrooksCorey") || model.equalsIgnoreCase("Mualem BC") ) {
-			myModel = new MualemBrooksCorey(rheologyModel);
+			myModel = new MualemBrooksCorey(closureEquation);
 		} else if (model.equalsIgnoreCase("Mualem Kosugi") || model.equalsIgnoreCase("MualemKosugy") ) {
-			myModel = new MualemKosugi(rheologyModel);
+			myModel = new MualemKosugi(closureEquation);
 		} else if (model.equalsIgnoreCase("Mualem Romano") || model.equalsIgnoreCase("MualemRomano") ) {
-			myModel = new MualemRomano(rheologyModel);
-		} else {
+			myModel = new MualemRomano(closureEquation);
+		} else if (model.equalsIgnoreCase("Soil Thermal Conductivity Cosenza") || model.equalsIgnoreCase("SoilThermalConductivityCosenza") || model.equalsIgnoreCase("Cosenza")) {
+			myModel = new SoilThermalConductivityCosenza(closureEquation);
+		} else if (model.equalsIgnoreCase("Water Thermal Conductivity") || model.equalsIgnoreCase("WaterThermalConductivity") || model.equalsIgnoreCase("Water")) {
+			myModel = new WaterThermalConductivity(closureEquation);
+		}  else {
 			System.out.println("\n\n\tERROR: please check the name for the unsaturated hydraulic conductivity model.");
 		}
 		return myModel;
diff --git a/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/Hornberger1998.java b/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/Hornberger1998.java
@@ -31,9 +31,9 @@ public class Hornberger1998  extends UnsaturatedHydraulicConductivityTemperature
 	
 	
 	
-	public Hornberger1998(ClosureEquation modelSWRC, ConductivityEquation modelUHC) {
+	public Hornberger1998(ClosureEquation closureEquation, ConductivityEquation modelUHC) {
 		
-		super(modelSWRC);
+		super(closureEquation);
 		this.modelUHC = modelUHC;
 		
 	}
diff --git a/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/Johansen.java b/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/Johansen.java
@@ -44,10 +44,10 @@ public Johansen(ClosureEquation rheology) {
 	
 	public double k(double x, int id, int element) {
 		
-		iceRatio = (super.rheology.parameters.thetaS[id] - rheology.f(x, id))/super.rheology.parameters.thetaS[id];
+		iceRatio = (super.closureEquation.parameters.thetaS[id] - closureEquation.f(x, id))/super.closureEquation.parameters.thetaS[id];
 		kerstenNumber = 1.0; // soil is assumed to be always saturated
 		
-		return Math.pow(super.rheology.parameters.thermalConductivitySoilParticles[id], 1-super.rheology.parameters.thetaS[id]) * Math.pow(super.rheology.parameters.thermalConductivityWater, (1-iceRatio)*super.rheology.parameters.thetaS[id]) * Math.pow(super.rheology.parameters.thermalConductivityIce, iceRatio*super.rheology.parameters.thetaS[id]);
+		return Math.pow(super.closureEquation.parameters.thermalConductivitySoilParticles[id], 1-super.closureEquation.parameters.thetaS[id]) * Math.pow(super.closureEquation.parameters.thermalConductivityWater, (1-iceRatio)*super.closureEquation.parameters.thetaS[id]) * Math.pow(super.closureEquation.parameters.thermalConductivityIce, iceRatio*super.closureEquation.parameters.thetaS[id]);
 	}
 
 
diff --git a/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/MualemBrooksCorey.java b/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/MualemBrooksCorey.java
@@ -33,18 +33,18 @@ public class MualemBrooksCorey extends ConductivityEquation{
 	
 	private double saturationDegree = -999.0;
 	
-	public MualemBrooksCorey(ClosureEquation rheology) {
-		super(rheology);
+	public MualemBrooksCorey(ClosureEquation closureEquation) {
+		super(closureEquation);
 	}
 	
 	
 	public double k(double x, double y, int id, int element) {
 			
-		saturationDegree = (super.rheology.f(x, y, id) - super.rheology.parameters.thetaR[id])/(super.rheology.parameters.thetaS[id] -super. rheology.parameters.thetaR[id]); 
+		saturationDegree = (super.closureEquation.f(x, y, id) - super.closureEquation.parameters.thetaR[id])/(super.closureEquation.parameters.thetaS[id] -super.closureEquation.parameters.thetaR[id]); 
 		if(saturationDegree<1) {
-			return super.rheology.parameters.kappaSaturation[id] * Math.pow(saturationDegree, 3+2/super.rheology.parameters.par1[id]);
+			return super.closureEquation.parameters.kappaSaturation[id] * Math.pow(saturationDegree, 3+2/super.closureEquation.parameters.par1[id]);
 		} else {
-			return super.rheology.parameters.kappaSaturation[id];
+			return super.closureEquation.parameters.kappaSaturation[id];
 		}
 		
 	
diff --git a/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/MualemKosugi.java b/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/MualemKosugi.java
@@ -38,19 +38,19 @@ public class MualemKosugi extends ConductivityEquation{
 	final double eta = 1;   // Kosugi, 1996
 	private double saturationDegree = -999.0;
 	
-	public MualemKosugi(ClosureEquation rheology) {
-		super(rheology);
+	public MualemKosugi(ClosureEquation closureEquation) {
+		super(closureEquation);
 		// TODO Auto-generated constructor stub
 	}
 	
 	
 	public double k(double x, double y, int id, int element) {
 			
-		saturationDegree = (super.rheology.f(x, y, id) - super.rheology.parameters.thetaR[id])/( super.rheology.parameters.thetaS[id] -  super.rheology.parameters.thetaR[id]); 
+		saturationDegree = (super.closureEquation.f(x, y, id) - super.closureEquation.parameters.thetaR[id])/( super.closureEquation.parameters.thetaS[id] -  super.closureEquation.parameters.thetaR[id]); 
 		if(saturationDegree<1) {
-			return super.rheology.parameters.kappaSaturation[id] * Math.pow(this.saturationDegree, 0.5)*Math.pow( ( 0.5*Erf.erfc( Math.log(x/ super.rheology.parameters.par1[id])/(Math.sqrt(2)*super.rheology.parameters.par2[id]) + super.rheology.parameters.par2[id]/Math.sqrt(2)  ) ),2 );
+			return super.closureEquation.parameters.kappaSaturation[id] * Math.pow(this.saturationDegree, 0.5)*Math.pow( ( 0.5*Erf.erfc( Math.log(x/ super.closureEquation.parameters.par1[id])/(Math.sqrt(2)*super.closureEquation.parameters.par2[id]) + super.closureEquation.parameters.par2[id]/Math.sqrt(2)  ) ),2 );
 		} else {
-			return super.rheology.parameters.kappaSaturation[id];
+			return super.closureEquation.parameters.kappaSaturation[id];
 		}
 		
 	
diff --git a/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/MualemRomano.java b/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/MualemRomano.java
@@ -39,23 +39,23 @@ public class MualemRomano extends ConductivityEquation{
 	private double b;
 	private double saturationDegree = -999.0;
 	
-	public MualemRomano(ClosureEquation rheology) {
-		super(rheology);
+	public MualemRomano(ClosureEquation closureEquation) {
+		super(closureEquation);
 		// TODO Auto-generated constructor stub
 	}
 	
 	
 	public double k(double x, double y, int id, int element) {
 		
-		saturationDegree = (super.rheology.f(x, y, id) - super.rheology.parameters.thetaR[id])/(super.rheology.parameters.thetaS[id] - super.rheology.parameters.thetaR[id]); 
+		saturationDegree = (super.closureEquation.f(x, y, id) - super.closureEquation.parameters.thetaR[id])/(super.closureEquation.parameters.thetaS[id] - super.closureEquation.parameters.thetaR[id]); 
 		if(saturationDegree<1) {
-			alpha= ( Math.pow(super.rheology.parameters.par2[id], 2) + Math.log(x/super.rheology.parameters.par4[id]) ) / ( super.rheology.parameters.par2[id]*Math.sqrt(2) );
-			beta = ( Math.pow(super.rheology.parameters.par3[id], 2) + Math.log(x/super.rheology.parameters.par5[id]) ) / ( super.rheology.parameters.par3[id]*Math.sqrt(2) );
-			a = super.rheology.parameters.par1[id]/super.rheology.parameters.par4[id] * Math.exp(Math.pow(super.rheology.parameters.par2[id],2)/2);
-			b = (1-super.rheology.parameters.par1[id])/super.rheology.parameters.par5[id] * Math.exp(Math.pow(super.rheology.parameters.par3[id],2)/2);
-			return super.rheology.parameters.kappaSaturation[id] * Math.sqrt(this.saturationDegree)/(4*Math.pow(a+b, 2)) * Math.pow(a*Erf.erfc(alpha) + b*Erf.erfc(beta), 2);
+			alpha= ( Math.pow(super.closureEquation.parameters.par2[id], 2) + Math.log(x/super.closureEquation.parameters.par4[id]) ) / ( super.closureEquation.parameters.par2[id]*Math.sqrt(2) );
+			beta = ( Math.pow(super.closureEquation.parameters.par3[id], 2) + Math.log(x/super.closureEquation.parameters.par5[id]) ) / ( super.closureEquation.parameters.par3[id]*Math.sqrt(2) );
+			a = super.closureEquation.parameters.par1[id]/super.closureEquation.parameters.par4[id] * Math.exp(Math.pow(super.closureEquation.parameters.par2[id],2)/2);
+			b = (1-super.closureEquation.parameters.par1[id])/super.closureEquation.parameters.par5[id] * Math.exp(Math.pow(super.closureEquation.parameters.par3[id],2)/2);
+			return super.closureEquation.parameters.kappaSaturation[id] * Math.sqrt(this.saturationDegree)/(4*Math.pow(a+b, 2)) * Math.pow(a*Erf.erfc(alpha) + b*Erf.erfc(beta), 2);
 		} else {
-			return super.rheology.parameters.kappaSaturation[id];
+			return super.closureEquation.parameters.kappaSaturation[id];
 		}
 		
 	
diff --git a/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/MualemVanGenuchten.java b/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/MualemVanGenuchten.java
@@ -34,20 +34,20 @@ public class MualemVanGenuchten extends ConductivityEquation{
 	private double m = -999.0;
 	private double saturationDegree = -999.0;
 	
-	public MualemVanGenuchten(ClosureEquation rheology) {
-		super(rheology);
+	public MualemVanGenuchten(ClosureEquation closureEquation) {
+		super(closureEquation);
 		// TODO Auto-generated constructor stub
 	}
 	
 	
 	public double k(double x, double y, int id, int element) {
 			
-		this.m = 1-1/super.rheology.parameters.par1[id];
-		saturationDegree = (super.rheology.f(x, y, id) - super.rheology.parameters.thetaR[id])/(super.rheology.parameters.thetaS[id] - super.rheology.parameters.thetaR[id]); 
+		this.m = 1-1/super.closureEquation.parameters.par1[id];
+		saturationDegree = (super.closureEquation.f(x, y, id) - super.closureEquation.parameters.thetaR[id])/(super.closureEquation.parameters.thetaS[id] - super.closureEquation.parameters.thetaR[id]); 
 		if(saturationDegree<1) {
-			return super.rheology.parameters.kappaSaturation[id] * Math.pow(saturationDegree, 0.5 ) * Math.pow(1.0 - Math.pow(1.0 - Math.pow(saturationDegree, 1.0/m), m), 2.0);
+			return super.closureEquation.parameters.kappaSaturation[id] * Math.pow(saturationDegree, 0.5 ) * Math.pow(1.0 - Math.pow(1.0 - Math.pow(saturationDegree, 1.0/m), m), 2.0);
 		} else {
-			return super.rheology.parameters.kappaSaturation[id];
+			return super.closureEquation.parameters.kappaSaturation[id];
 		}
 		
 	
diff --git a/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/NoTemperature.java b/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/NoTemperature.java
@@ -31,7 +31,7 @@ public class NoTemperature  extends UnsaturatedHydraulicConductivityTemperatureD
 	
 	
 	
-	public NoTemperature(ClosureEquation modelSWRC, ConductivityEquation modelUHC) {
+	public NoTemperature(ClosureEquation closureEquation, ConductivityEquation modelUHC) {
 		
 		super(modelSWRC);
 		this.modelUHC = modelUHC;
diff --git a/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/Ronan1998.java b/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/Ronan1998.java
@@ -31,9 +31,9 @@ public class Ronan1998  extends UnsaturatedHydraulicConductivityTemperatureDecor
 	
 	
 	
-	public Ronan1998(ClosureEquation modelSWRC, ConductivityEquation modelUHC) {
+	public Ronan1998(ClosureEquation closureEquation, ConductivityEquation modelUHC) {
 		
-		super(modelSWRC);
+		super(closureEquation);
 		this.modelUHC = modelUHC;
 		
 	}
diff --git a/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/UnsaturatedHydraulicConductivityTemperatureDecorator.java b/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/UnsaturatedHydraulicConductivityTemperatureDecorator.java
@@ -29,8 +29,8 @@
 public abstract class UnsaturatedHydraulicConductivityTemperatureDecorator extends ConductivityEquation {
 	
 	
-	UnsaturatedHydraulicConductivityTemperatureDecorator(ClosureEquation modelSWRC) {
-		super(modelSWRC);
+	UnsaturatedHydraulicConductivityTemperatureDecorator(ClosureEquation closureEquation) {
+		super(closureEquation);
 		// TODO Auto-generated constructor stub
 	}
 	
diff --git a/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/UnsaturatedHydraulicConductivityTemperatureFactory.java b/src/main/java/it/geoframe/blogspot/closureequation/conductivitymodel/UnsaturatedHydraulicConductivityTemperatureFactory.java
@@ -33,15 +33,15 @@ public class UnsaturatedHydraulicConductivityTemperatureFactory {
 	
 	UnsaturatedHydraulicConductivityTemperatureDecorator unsaturatedHydraulicConductivityTemperature = null;
 	
-	public UnsaturatedHydraulicConductivityTemperatureDecorator create(String type, ClosureEquation modelSWRC,
+	public UnsaturatedHydraulicConductivityTemperatureDecorator create(String type, ClosureEquation closureEquation,
 																		ConductivityEquation modelUHC) {
 		
 		if( type.equalsIgnoreCase("Ronan") || type.equalsIgnoreCase("Ronan1998") ) {
-			unsaturatedHydraulicConductivityTemperature = new Ronan1998(modelSWRC, modelUHC);
+			unsaturatedHydraulicConductivityTemperature = new Ronan1998(closureEquation, modelUHC);
 		} else if ( type.equalsIgnoreCase("Hornberger") || type.equalsIgnoreCase("Hornberger1998") ) {
-			unsaturatedHydraulicConductivityTemperature = new Hornberger1998(modelSWRC, modelUHC);
+			unsaturatedHydraulicConductivityTemperature = new Hornberger1998(closureEquation, modelUHC);
 		} else if ( type.equalsIgnoreCase("No temperature") || type.equalsIgnoreCase("notemperature") ) {
-			unsaturatedHydraulicConductivityTemperature = new NoTemperature(modelSWRC, modelUHC);
+			unsaturatedHydraulicConductivityTemperature = new NoTemperature(closureEquation, modelUHC);
 		}
 		
 		return unsaturatedHydraulicConductivityTemperature;

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ public ClosureEquation create(String model) {`
`41`	`41`	`myModel = new SWRCRomano();`
`42`	`42`	`}else if(model.equalsIgnoreCase("Water Depth") \|\| model.equalsIgnoreCase("WaterDepth")) {`
`43`	`43`	`myModel = new WaterDepth();`
	`44`	`+ }else if(model.equalsIgnoreCase("None") \|\| model.equalsIgnoreCase("")) {`
	`45`	`+ myModel = new NoneClosureEquation();`
`44`	`46`	`}else {`
`45`	`47`	`System.out.println("\n\n\tERROR: please check swrcModel name.");`
`46`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ public class Hornberger1998 extends UnsaturatedHydraulicConductivityTemperature`
`31`	`31`
`32`	`32`
`33`	`33`
`34`		`- public Hornberger1998(ClosureEquation modelSWRC, ConductivityEquation modelUHC) {`
	`34`	`+ public Hornberger1998(ClosureEquation closureEquation, ConductivityEquation modelUHC) {`
`35`	`35`
`36`		`- super(modelSWRC);`
	`36`	`+ super(closureEquation);`
`37`	`37`	`this.modelUHC = modelUHC;`
`38`	`38`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,10 @@ public Johansen(ClosureEquation rheology) {`
`44`	`44`
`45`	`45`	`public double k(double x, int id, int element) {`
`46`	`46`
`47`		`- iceRatio = (super.rheology.parameters.thetaS[id] - rheology.f(x, id))/super.rheology.parameters.thetaS[id];`
	`47`	`+ iceRatio = (super.closureEquation.parameters.thetaS[id] - closureEquation.f(x, id))/super.closureEquation.parameters.thetaS[id];`
`48`	`48`	`kerstenNumber = 1.0; // soil is assumed to be always saturated`
`49`	`49`
`50`		`- return Math.pow(super.rheology.parameters.thermalConductivitySoilParticles[id], 1-super.rheology.parameters.thetaS[id]) * Math.pow(super.rheology.parameters.thermalConductivityWater, (1-iceRatio)super.rheology.parameters.thetaS[id]) Math.pow(super.rheology.parameters.thermalConductivityIce, iceRatio*super.rheology.parameters.thetaS[id]);`
	`50`	`+ return Math.pow(super.closureEquation.parameters.thermalConductivitySoilParticles[id], 1-super.closureEquation.parameters.thetaS[id]) * Math.pow(super.closureEquation.parameters.thermalConductivityWater, (1-iceRatio)super.closureEquation.parameters.thetaS[id]) Math.pow(super.closureEquation.parameters.thermalConductivityIce, iceRatio*super.closureEquation.parameters.thetaS[id]);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`