diff --git a/python/ngen_conf/tests/data/init_config_data/lgar.txt b/python/ngen_conf/tests/data/init_config_data/lgar.txt index 6a4b35fa..d5c49996 100644 --- a/python/ngen_conf/tests/data/init_config_data/lgar.txt +++ b/python/ngen_conf/tests/data/init_config_data/lgar.txt @@ -1,15 +1,15 @@ -verbosity=none -soil_params_file=./data/vG_default_params.dat +soil_params_file=data/vG_default_params.dat layer_thickness=44.0,131.0,25.0[cm] initial_psi=2000.0[cm] -timestep=300[sec] +ponded_depth_max=2.0[cm] +timestep=300.0[sec] +forcing_resolution=3600.0[sec] endtime=7500.0[hr] -forcing_resolution=3600[sec] -ponded_depth_max=2[cm] -use_closed_form_G=false layer_soil_type=13,14,15 max_soil_types=25 wilting_point_psi=15495.0[cm] +use_closed_form_G=false giuh_ordinates=0.06,0.51,0.28,0.12,0.03 +verbosity=none sft_coupled=true -soil_z=10,20,30,40,50,60,70,80,90,100.0,110.,120,130.,140.,150.,160.,170.,180.,190.,200.0[cm] +soil_z=10.0,20.0,30.0,40.0,50.0,60.0,70.0,80.0,90.0,100.0,110.0,120.0,130.0,140.0,150.0,160.0,170.0,180.0,190.0,200.0[cm] diff --git a/python/ngen_conf/tests/data/init_config_data/soil_freeze_thaw.txt b/python/ngen_conf/tests/data/init_config_data/soil_freeze_thaw.txt index 82ada735..456bec5f 100644 --- a/python/ngen_conf/tests/data/init_config_data/soil_freeze_thaw.txt +++ b/python/ngen_conf/tests/data/init_config_data/soil_freeze_thaw.txt @@ -1,7 +1,4 @@ verbosity=none -soil_moisture_bmi=1 -end_time=24566[h] -dt=1.0[h] smcmax=0.439[m/m] b=5.25[] satpsi=0.355[m] @@ -9,3 +6,6 @@ quartz=0.4[] ice_fraction_scheme=Schaake[] soil_z=0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,1.9,2.0[m] soil_temperature=280.15,280.15,280.15,280.15,280.15,280.15,280.15,280.15,280.15,280.15,280.15,280.15,280.15,280.15,280.15,280.15,280.15,280.15,280.15,280.15[K] +soil_moisture_bmi=1 +end_time=24566[h] +dt=1.0[h] diff --git a/python/ngen_conf/tests/data/init_config_data/soil_moisture_profile.txt b/python/ngen_conf/tests/data/init_config_data/soil_moisture_profile.txt index d782a2f4..5a3d549d 100644 --- a/python/ngen_conf/tests/data/init_config_data/soil_moisture_profile.txt +++ b/python/ngen_conf/tests/data/init_config_data/soil_moisture_profile.txt @@ -1,6 +1,6 @@ -soil_params.smcmax=0.439 -soil_params.b=5.25 -soil_params.satpsi=0.355 soil_z=0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,1.9,2.0 +smcmax=0.439 +b=5.25 +satpsi=0.355 soil_storage_model=conceptual soil_storage_depth=2.0