Skip to content

Commit 4749274

Browse files
committed
Fix error with if condition.
1 parent 168c812 commit 4749274

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/main/java/it/geoframe/blogspot/closureequation/closureequation/SWRCBrooksCorey.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class SWRCBrooksCorey extends SoilWaterRetentionCurve {
3535
@Override
3636
public double f(double x, double y, int id) {
3737

38-
if(x>0.0) {
38+
if(x>=0.0) {
3939
return super.parameters.thetaS[id] +
4040
9.81*(super.parameters.alphaSpecificStorage[id] + super.parameters.thetaS[id]*super.parameters.betaSpecificStorage[id])*x;
4141
} else if(x<=super.parameters.par2[id]) {
@@ -50,7 +50,7 @@ public double f(double x, double y, int id) {
5050
@Override
5151
public double df(double x, double y, int id) {
5252

53-
if(x>0.0) {
53+
if(x>=0.0) {
5454
return 9.81*( super.parameters.alphaSpecificStorage[id] + super.parameters.thetaS[id]*super.parameters.betaSpecificStorage[id] );
5555
} else if(x<=super.parameters.par2[id]) {
5656
return super.parameters.par1[id]*(super.parameters.thetaS[id] - super.parameters.thetaR[id])/Math.abs(super.parameters.par2[id]) * Math.pow(super.parameters.par2[id]/x,super.parameters.par1[id]+1);

src/main/java/it/geoframe/blogspot/closureequation/closureequation/SWRCKosugi.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class SWRCKosugi extends SoilWaterRetentionCurve {
3838
public double f(double x, double y, int id) {
3939

4040

41-
if(x>0.0) {
41+
if(x>=0.0) {
4242
return super.parameters.thetaS[id] +
4343
9.81*(super.parameters.alphaSpecificStorage[id] + super.parameters.thetaS[id]*super.parameters.betaSpecificStorage[id])*x;
4444
} else {
@@ -53,7 +53,7 @@ public double f(double x, double y, int id) {
5353
@Override
5454
public double df(double x, double y, int id) {
5555

56-
if(x>0.0) {
56+
if(x>=0.0) {
5757
return 9.81*( super.parameters.alphaSpecificStorage[id] + super.parameters.thetaS[id]*super.parameters.betaSpecificStorage[id] );
5858
} else {
5959
return (super.parameters.thetaS[id]-super.parameters.thetaR[id])/(Math.sqrt(2*Math.PI)*super.parameters.par2[id]*(-x)) * Math.exp(-Math.pow( Math.log(x/super.parameters.par1[id]),2)/(2*Math.pow(super.parameters.par2[id],2)));

src/main/java/it/geoframe/blogspot/closureequation/closureequation/SWRCVanGenuchten.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public double f(double x, double y, int id) {
3939

4040
m = 1-1/super.parameters.par1[id];
4141

42-
if(x>0.0) {
42+
if(x>=0.0) {
4343
return super.parameters.thetaS[id] +
4444
9.81*(super.parameters.alphaSpecificStorage[id] + super.parameters.thetaS[id]*super.parameters.betaSpecificStorage[id])*x;
4545
} else {
@@ -55,7 +55,7 @@ public double f(double x, double y, int id) {
5555
public double df(double x, double y, int id) {
5656
m = 1-1/super.parameters.par1[id];
5757

58-
if(x>0.0) {
58+
if(x>=0.0) {
5959
return 9.81*( super.parameters.alphaSpecificStorage[id] + super.parameters.thetaS[id]*super.parameters.betaSpecificStorage[id] );
6060
} else {
6161
return super.parameters.par2[id]*super.parameters.par1[id]*this.m*(super.parameters.thetaS[id] - super.parameters.thetaR[id]) / Math.pow(1.0 + Math.pow(Math.abs(super.parameters.par2[id]*x), super.parameters.par1[id]), this.m + 1.0)*Math.pow(Math.abs(super.parameters.par2[id]*x), super.parameters.par1[id] - 1.0);

0 commit comments

Comments
 (0)