Skip to content

Commit

Permalink
removed the parameter m as a parameter that can be specipied in the .…
Browse files Browse the repository at this point in the history 
…dat file. Now m is internally calculated as 1-1/n. To make this change, I updated a couple of lines in lgar.cxx and then removed m from the parameter files. (#7)

Co-authored-by: Peter La Follette <[email protected]>
  • Loading branch information
@peterlafollette
peterlafollette and Peter La Follette authored Jan 11, 2024
1 parent a9e497d commit c4b3216
Show file tree
Hide file tree
Showing 6 changed files with 88 additions and 88 deletions.
38 changes: 19 additions & 19 deletions data/vG_default_params.dat
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
"Texture theta_r theta_e alpha (cm^-1) n m Ks (cm/h)"
"Clay" 0.1 0.46 1.00E-02 1.25 0.2 0.612
"Clay-loam" 0.08 0.44 2.00E-02 1.42 0.29 0.3348
"Loam" 0.06 0.4 1.00E-02 1.47 0.32 0.504
"Loamy-sand" 0.05 0.39 3.00E-02 1.75 0.43 4.32
"Sand" 0.05 0.38 4.00E-02 3.18 0.69 26.64
"Sandy-clay" 0.12 0.39 3.00E-02 1.21 0.17 0.468
"Sandy-clay loam" 0.06 0.38 2.00E-02 1.33 0.25 0.54
"Sandy-loam" 0.04 0.39 3.00E-02 1.45 0.31 1.584
"Silt" 0.05 0.49 1.00E-02 1.68 0.4 1.836
"Silty-clay" 0.11 0.48 2.00E-02 1.32 0.24 0.432
"Silty-clay loam" 0.09 0.48 1.00E-02 1.52 0.34 0.468
"Silt-loam" 0.07 0.44 1.00E-02 1.66 0.4 0.756
"P-1" 0.0648 0.4513 0.0031297 1.6858 0.40680982322 0.45
"P-2" 0.0831 0.4773 0.0083272 1.299 0.23017705927 0.07
"P-3" 0.0668 0.4617 0.0037454 1.6151 0.38084329143 0.45
"B-1" 0.0649 0.4481 0.009567 1.3579 0.263568 0.07
"B-2" 0.0672 0.4760 0.005288 1.5276 0.345378 0.02
"B-3" 0.0823 0.4782 0.004467 1.4585 0.314364 0.20
"Texture theta_r theta_e alpha (cm^-1) n Ks (cm/h)"
"Clay" 0.1 0.46 1.00E-02 1.25 0.612
"Clay-loam" 0.08 0.44 2.00E-02 1.42 0.3348
"Loam" 0.06 0.4 1.00E-02 1.47 0.504
"Loamy-sand" 0.05 0.39 3.00E-02 1.75 4.32
"Sand" 0.05 0.38 4.00E-02 3.18 26.64
"Sandy-clay" 0.12 0.39 3.00E-02 1.21 0.468
"Sandy-clay loam" 0.06 0.38 2.00E-02 1.33 0.54
"Sandy-loam" 0.04 0.39 3.00E-02 1.45 1.584
"Silt" 0.05 0.49 1.00E-02 1.68 1.836
"Silty-clay" 0.11 0.48 2.00E-02 1.32 0.432
"Silty-clay loam" 0.09 0.48 1.00E-02 1.52 0.468
"Silt-loam" 0.07 0.44 1.00E-02 1.66 0.756
"P-1" 0.0648 0.4513 0.0031297 1.6858 0.45
"P-2" 0.0831 0.4773 0.0083272 1.299 0.07
"P-3" 0.0668 0.4617 0.0037454 1.6151 0.45
"B-1" 0.0649 0.4481 0.009567 1.3579 0.07
"B-2" 0.0672 0.4760 0.005288 1.5276 0.02
"B-3" 0.0823 0.4782 0.004467 1.4585 0.20
32 changes: 16 additions & 16 deletions data/vG_default_params_synth_1.dat
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
"Texture theta_r theta_e alpha (cm^-1) n m Ks (cm/h)"
"Clay" 0.1 0.46 1.00E-02 1.25 0.2 0.612
"Clay-loam" 0.08 0.44 2.00E-02 1.42 0.29 0.3348
"Loam" 0.06 0.4 1.00E-02 1.47 0.32 0.504
"Loamy-sand" 0.05 0.39 3.00E-02 1.75 0.43 4.32
"Sand" 0.05 0.38 4.00E-02 3.18 0.69 26.64
"Sandy-clay" 0.12 0.39 3.00E-02 1.21 0.17 0.468
"Sandy-clay loam" 0.06 0.38 2.00E-02 1.33 0.25 0.54
"Sandy-loam" 0.04 0.39 3.00E-02 1.45 0.31 1.584
"Silt" 0.05 0.49 1.00E-02 1.68 0.4 1.836
"Silty-clay" 0.11 0.48 2.00E-02 1.32 0.24 0.432
"Silty-clay loam" 0.09 0.48 1.00E-02 1.52 0.34 0.468
"Silt-loam" 0.07 0.44 1.00E-02 1.66 0.4 0.756
"S1-1" 0.078 0.43 0.036 1.56 0.358974 3.12
"S1-2" 0.095 0.41 0.019 1.31 0.23664 0.26
"S1-3" 0.089 0.43 0.010 1.23 0.186991 0.07
"Texture theta_r theta_e alpha (cm^-1) n Ks (cm/h)"
"Clay" 0.1 0.46 1.00E-02 1.25 0.612
"Clay-loam" 0.08 0.44 2.00E-02 1.42 0.3348
"Loam" 0.06 0.4 1.00E-02 1.47 0.504
"Loamy-sand" 0.05 0.39 3.00E-02 1.75 4.32
"Sand" 0.05 0.38 4.00E-02 3.18 26.64
"Sandy-clay" 0.12 0.39 3.00E-02 1.21 0.468
"Sandy-clay loam" 0.06 0.38 2.00E-02 1.33 0.54
"Sandy-loam" 0.04 0.39 3.00E-02 1.45 1.584
"Silt" 0.05 0.49 1.00E-02 1.68 1.836
"Silty-clay" 0.11 0.48 2.00E-02 1.32 0.432
"Silty-clay loam" 0.09 0.48 1.00E-02 1.52 0.468
"Silt-loam" 0.07 0.44 1.00E-02 1.66 0.756
"S1-1" 0.078 0.43 0.036 1.56 3.12
"S1-2" 0.095 0.41 0.019 1.31 0.26
"S1-3" 0.089 0.43 0.010 1.23 0.07
32 changes: 16 additions & 16 deletions data/vG_default_params_synth_2.dat
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
"Texture theta_r theta_e alpha (cm^-1) n m Ks (cm/h)"
"Clay" 0.1 0.46 1.00E-02 1.25 0.2 0.612
"Clay-loam" 0.08 0.44 2.00E-02 1.42 0.29 0.3348
"Loam" 0.06 0.4 1.00E-02 1.47 0.32 0.504
"Loamy-sand" 0.05 0.39 3.00E-02 1.75 0.43 4.32
"Sand" 0.05 0.38 4.00E-02 3.18 0.69 26.64
"Sandy-clay" 0.12 0.39 3.00E-02 1.21 0.17 0.468
"Sandy-clay loam" 0.06 0.38 2.00E-02 1.33 0.25 0.54
"Sandy-loam" 0.04 0.39 3.00E-02 1.45 0.31 1.584
"Silt" 0.05 0.49 1.00E-02 1.68 0.4 1.836
"Silty-clay" 0.11 0.48 2.00E-02 1.32 0.24 0.432
"Silty-clay loam" 0.09 0.48 1.00E-02 1.52 0.34 0.468
"Silt-loam" 0.07 0.44 1.00E-02 1.66 0.4 0.756
"S3-1" 0.057 0.41 0.124 2.28 0.5614035 14.59
"S3-2" 0.078 0.43 0.036 1.56 0.3589743 1.04
"S3-3" 0.067 0.45 0.020 1.41 0.290780 0.45
"Texture theta_r theta_e alpha (cm^-1) n Ks (cm/h)"
"Clay" 0.1 0.46 1.00E-02 1.25 0.612
"Clay-loam" 0.08 0.44 2.00E-02 1.42 0.3348
"Loam" 0.06 0.4 1.00E-02 1.47 0.504
"Loamy-sand" 0.05 0.39 3.00E-02 1.75 4.32
"Sand" 0.05 0.38 4.00E-02 3.18 26.64
"Sandy-clay" 0.12 0.39 3.00E-02 1.21 0.468
"Sandy-clay loam" 0.06 0.38 2.00E-02 1.33 0.54
"Sandy-loam" 0.04 0.39 3.00E-02 1.45 1.584
"Silt" 0.05 0.49 1.00E-02 1.68 1.836
"Silty-clay" 0.11 0.48 2.00E-02 1.32 0.432
"Silty-clay loam" 0.09 0.48 1.00E-02 1.52 0.468
"Silt-loam" 0.07 0.44 1.00E-02 1.66 0.756
"S3-1" 0.057 0.41 0.124 2.28 14.59
"S3-2" 0.078 0.43 0.036 1.56 1.04
"S3-3" 0.067 0.45 0.020 1.41 0.45
32 changes: 16 additions & 16 deletions data/vG_default_params_synth_3.dat
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
"Texture theta_r theta_e alpha (cm^-1) n m Ks (cm/h)"
"Clay" 0.1 0.46 1.00E-02 1.25 0.2 0.612
"Clay-loam" 0.08 0.44 2.00E-02 1.42 0.29 0.3348
"Loam" 0.06 0.4 1.00E-02 1.47 0.32 0.504
"Loamy-sand" 0.05 0.39 3.00E-02 1.75 0.43 4.32
"Sand" 0.05 0.38 4.00E-02 3.18 0.69 26.64
"Sandy-clay" 0.12 0.39 3.00E-02 1.21 0.17 0.468
"Sandy-clay loam" 0.06 0.38 2.00E-02 1.33 0.25 0.54
"Sandy-loam" 0.04 0.39 3.00E-02 1.45 0.31 1.584
"Silt" 0.05 0.49 1.00E-02 1.68 0.4 1.836
"Silty-clay" 0.11 0.48 2.00E-02 1.32 0.24 0.432
"Silty-clay loam" 0.09 0.48 1.00E-02 1.52 0.34 0.468
"Silt-loam" 0.07 0.44 1.00E-02 1.66 0.4 0.756
"S3-1" 0.057 0.41 0.124 2.28 0.5614035 14.59
"S3-2" 0.078 0.43 0.036 1.56 0.3589743 1.04
"S3-3" 0.067 0.45 0.020 1.41 0.290780 0.45
"Texture theta_r theta_e alpha (cm^-1) n Ks (cm/h)"
"Clay" 0.1 0.46 1.00E-02 1.25 0.612
"Clay-loam" 0.08 0.44 2.00E-02 1.42 0.3348
"Loam" 0.06 0.4 1.00E-02 1.47 0.504
"Loamy-sand" 0.05 0.39 3.00E-02 1.75 4.32
"Sand" 0.05 0.38 4.00E-02 3.18 26.64
"Sandy-clay" 0.12 0.39 3.00E-02 1.21 0.468
"Sandy-clay loam" 0.06 0.38 2.00E-02 1.33 0.54
"Sandy-loam" 0.04 0.39 3.00E-02 1.45 1.584
"Silt" 0.05 0.49 1.00E-02 1.68 1.836
"Silty-clay" 0.11 0.48 2.00E-02 1.32 0.432
"Silty-clay loam" 0.09 0.48 1.00E-02 1.52 0.468
"Silt-loam" 0.07 0.44 1.00E-02 1.66 0.756
"S3-1" 0.057 0.41 0.124 2.28 14.59
"S3-2" 0.078 0.43 0.036 1.56 1.04
"S3-3" 0.067 0.45 0.020 1.41 0.45
38 changes: 19 additions & 19 deletions data/vG_default_params_synthetic.dat
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
"Texture theta_r theta_e alpha (cm^-1) n m Ks (cm/h)"
"Clay" 0.1 0.46 1.00E-02 1.25 0.2 0.612
"Clay-loam" 0.08 0.44 2.00E-02 1.42 0.29 0.3348
"Loam" 0.06 0.4 1.00E-02 1.47 0.32 0.504
"Loamy-sand" 0.05 0.39 3.00E-02 1.75 0.43 4.32
"Sand" 0.05 0.38 4.00E-02 3.18 0.69 26.64
"Sandy-clay" 0.12 0.39 3.00E-02 1.21 0.17 0.468
"Sandy-clay loam" 0.06 0.38 2.00E-02 1.33 0.25 0.54
"Sandy-loam" 0.04 0.39 3.00E-02 1.45 0.31 1.584
"Silt" 0.05 0.49 1.00E-02 1.68 0.4 1.836
"Silty-clay" 0.11 0.48 2.00E-02 1.32 0.24 0.432
"Silty-clay loam" 0.09 0.48 1.00E-02 1.52 0.34 0.468
"Silt-loam" 0.07 0.44 1.00E-02 1.66 0.4 0.756
"S1-1" 0.078 0.43 0.036 1.56 0.358974 3.12
"S1-2" 0.095 0.41 0.019 1.31 0.23664 0.26
"S1-3" 0.089 0.43 0.010 1.23 0.186991 0.07
"S3-1" 0.057 0.41 0.124 2.28 0.5614035 14.59
"S3-2" 0.078 0.43 0.036 1.56 0.3589743 1.04
"S3-3" 0.067 0.45 0.020 1.41 0.290780 0.45
"Texture theta_r theta_e alpha (cm^-1) n Ks (cm/h)"
"Clay" 0.1 0.46 1.00E-02 1.25 0.612
"Clay-loam" 0.08 0.44 2.00E-02 1.42 0.3348
"Loam" 0.06 0.4 1.00E-02 1.47 0.504
"Loamy-sand" 0.05 0.39 3.00E-02 1.75 4.32
"Sand" 0.05 0.38 4.00E-02 3.18 26.64
"Sandy-clay" 0.12 0.39 3.00E-02 1.21 0.468
"Sandy-clay loam" 0.06 0.38 2.00E-02 1.33 0.54
"Sandy-loam" 0.04 0.39 3.00E-02 1.45 1.584
"Silt" 0.05 0.49 1.00E-02 1.68 1.836
"Silty-clay" 0.11 0.48 2.00E-02 1.32 0.432
"Silty-clay loam" 0.09 0.48 1.00E-02 1.52 0.468
"Silt-loam" 0.07 0.44 1.00E-02 1.66 0.756
"S1-1" 0.078 0.43 0.036 1.56 3.12
"S1-2" 0.095 0.41 0.019 1.31 0.26
"S1-3" 0.089 0.43 0.010 1.23 0.07
"S3-1" 0.057 0.41 0.124 2.28 14.59
"S3-2" 0.078 0.43 0.036 1.56 1.04
"S3-3" 0.067 0.45 0.020 1.41 0.45
4 changes: 2 additions & 2 deletions src/lgar.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2142,7 +2142,7 @@ extern int lgar_read_vG_param_file(char const* vG_param_file_name, int num_soil_
//for(soil=1;soil<=num_soil_types;soil++) {// read the num_soil_types lines with data
while (fgets(jstr,255,in_vG_params_fptr) != NULL) {

sscanf(jstr,"%s %lf %lf %lf %lf %lf %lf",soil_name,&theta_r,&theta_e,&vg_alpha_per_cm,&vg_n,&vg_m,&Ksat_cm_per_h);
sscanf(jstr,"%s %lf %lf %lf %lf %lf",soil_name,&theta_r,&theta_e,&vg_alpha_per_cm,&vg_n,&Ksat_cm_per_h);
length=strlen(soil_name);

if(length>MAX_SOIL_NAME_CHARS) {
Expand All @@ -2157,7 +2157,7 @@ extern int lgar_read_vG_param_file(char const* vG_param_file_name, int num_soil_
soil_properties[soil].theta_e = theta_e;
soil_properties[soil].vg_alpha_per_cm = vg_alpha_per_cm; // cm^(-1)
soil_properties[soil].vg_n = vg_n;
soil_properties[soil].vg_m = vg_m;
soil_properties[soil].vg_m = 1-1/vg_n;
soil_properties[soil].Ksat_cm_per_h = Ksat_cm_per_h;
soil_properties[soil].theta_wp = calc_theta_from_h(wilting_point_psi_cm, vg_alpha_per_cm,
vg_m, vg_n, theta_e, theta_r);
Expand Down

0 comments on commit c4b3216

Please sign in to comment.