diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties index 84581f4..08642dc 100644 --- a/.gradle/buildOutputCleanup/cache.properties +++ b/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Mon Feb 21 17:10:00 CET 2022 -gradle.version=6.6-milestone-3 +#Tue Mar 08 17:32:48 CET 2022 +gradle.version=6.6 diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs index e889521..477b9b6 100644 --- a/.settings/org.eclipse.buildship.core.prefs +++ b/.settings/org.eclipse.buildship.core.prefs @@ -1,2 +1,13 @@ +arguments= +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.6)) connection.project.dir= eclipse.preferences.version=1 +gradle.user.home= +java.home= +jvm.arguments= +offline.mode=false +override.workspace.settings=true +show.console.view=false +show.executions.view=false diff --git a/src/main/java/it/geoframe/blogspot/closureequation/closureequation/Parameters.java b/src/main/java/it/geoframe/blogspot/closureequation/closureequation/Parameters.java index ee7425d..ea065ce 100644 --- a/src/main/java/it/geoframe/blogspot/closureequation/closureequation/Parameters.java +++ b/src/main/java/it/geoframe/blogspot/closureequation/closureequation/Parameters.java @@ -35,6 +35,16 @@ public static Parameters getInstance(double referenceTemperatureSWRC, double bet return uniqueInstance; } + public static Parameters getInstance(double[] molecularDiffusion,double[] longitudinalDispersivity, double referenceTemperatureSWRC, double beta0, + double[] thetaS, double[] thetaR, double[] par1, double[] par2, double[] par3, double[] par4, double[] par5, double[] kappaSaturation, + double[] alphaSpecificStorage, double[] betaSpecificStorage) { + if (uniqueInstance == null) { + uniqueInstance = new Parameters(molecularDiffusion, longitudinalDispersivity,referenceTemperatureSWRC, beta0, + thetaS, thetaR,par1, par2, par3, par4, par5, kappaSaturation, alphaSpecificStorage, betaSpecificStorage); + } + return uniqueInstance; + } + public double waterDensity; public double iceDensity; @@ -62,6 +72,9 @@ public static Parameters getInstance(double referenceTemperatureSWRC, double bet public double[] alphaSpecificStorage; public double[] betaSpecificStorage; + public double[] molecularDiffusion; + public double[] longitudinalDispersivity; + private Parameters(double waterDensity, double iceDensity, double specificThermalCapacityWater, double specificThermalCapacityIce, double thermalConductivityWater, double thermalConductivityIce, double latentHeatFusion, double referenceTemperatureInternalEnergy, double referenceTemperatureSWRC, double beta0, @@ -125,6 +138,28 @@ private Parameters(double referenceTemperatureSWRC, double beta0, double[] theta } + + private Parameters(double[] molecularDiffusion,double[] longitudinalDispersivity, double referenceTemperatureSWRC, double beta0, + double[] thetaS, double[] thetaR, double[] par1, double[] par2, double[] par3, double[] par4, double[] par5, double[] kappaSaturation, + double[] alphaSpecificStorage, double[] betaSpecificStorage) { + + this.molecularDiffusion = molecularDiffusion.clone(); + this.longitudinalDispersivity = longitudinalDispersivity.clone(); + this.referenceTemperatureSWRC = referenceTemperatureSWRC; + this.beta0 = beta0; + this.thetaS = thetaS.clone(); + this.thetaR = thetaR.clone(); + this.par1 = par1.clone(); + this.par2 = par2.clone(); + this.par3 = par3.clone(); + this.par4 = par4.clone(); + this.par5 = par5.clone(); + this.kappaSaturation = kappaSaturation.clone(); + this.alphaSpecificStorage = alphaSpecificStorage.clone(); + this.betaSpecificStorage = betaSpecificStorage.clone(); + + + } }