Skip to content
This repository has been archived by the owner on Dec 23, 2020. It is now read-only.

Commit

Permalink
Merge branch 'test-dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@sunt05
sunt05 committed Feb 21, 2019
2 parents 5517643 + ab89dba commit 375306b
Show file tree
Hide file tree
Showing 34 changed files with 1,377 additions and 1,210 deletions.
6 changes: 3 additions & 3 deletions BenchmarkTest/BaseRun/2018b/Output/test1_2004_DailyState.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Year DOY Hour Min Dectime HDD1_h HDD2_c HDD3_Tmean HDD4_T5d P_day DaysSR GDD1_g GDD2_s GDD3_Tmin GDD4_Tmax GDD5_DLHrs LAI_EveTr LAI_DecTr LAI_Grass DecidCap Porosity AlbEveTr AlbDecTr AlbGrass WU_EveTr1 WU_EveTr2 WU_EveTr3 WU_DecTr1 WU_DecTr2 WU_DecTr3 WU_Grass1 WU_Grass2 WU_Grass3 deltaLAI LAIlumps AlbSnow DensSnow_Paved DensSnow_Bldgs DensSnow_EveTr DensSnow_DecTr DensSnow_Grass DensSnow_BSoil DensSnow_Water a1 a2 a3
2004 363 23 55 362.9965 19.5463 0.0000 -1.3463 -1.3463 2.1833 0.0000 0.0000 -12.7396 -5.0792 1.6000 8.0833 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
2004 364 23 55 363.9965 17.3808 0.0000 0.8826 -0.2318 0.8083 0.0000 0.0000 -23.1437 -0.3000 1.4917 15.9167 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
2004 365 23 55 364.9965 18.2216 0.0000 0.0418 -0.1406 0.2000 0.0000 0.0000 -34.4417 -2.1875 1.5917 24.9167 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
2004 366 23 55 365.9965 18.2241 0.0000 0.0393 -0.0956 0.2000 0.0000 0.0000 -45.7396 -2.1875 1.5917 33.9167 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
2004 364 23 55 363.9965 17.3808 0.0000 0.8826 -0.2318 0.8083 0.0000 0.0000 -23.1437 -0.3000 1.4917 7.8333 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
2004 365 23 55 364.9965 18.2216 0.0000 0.0418 -0.1406 0.2000 0.0000 0.0000 -34.4417 -2.1875 1.5917 9.0000 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
2004 366 23 55 365.9965 18.2241 0.0000 0.0393 -0.0956 0.2000 0.0000 0.0000 -45.7396 -2.1875 1.5917 9.0000 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
8 changes: 4 additions & 4 deletions BenchmarkTest/BaseRun/2018b/Output/test1_2005_DailyState.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Year DOY Hour Min Dectime HDD1_h HDD2_c HDD3_Tmean HDD4_T5d P_day DaysSR GDD1_g GDD2_s GDD3_Tmin GDD4_Tmax GDD5_DLHrs LAI_EveTr LAI_DecTr LAI_Grass DecidCap Porosity AlbEveTr AlbDecTr AlbGrass WU_EveTr1 WU_EveTr2 WU_EveTr3 WU_DecTr1 WU_DecTr2 WU_DecTr3 WU_Grass1 WU_Grass2 WU_Grass3 deltaLAI LAIlumps AlbSnow DensSnow_Paved DensSnow_Bldgs DensSnow_EveTr DensSnow_DecTr DensSnow_Grass DensSnow_BSoil DensSnow_Water a1 a2 a3
2005 1 23 55 0.9965 19.5695 0.0000 -1.3695 -0.2739 2.1833 0.0000 0.0000 -12.7396 -5.0792 1.6000 8.0833 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
2005 2 23 55 1.9965 19.6056 0.0000 -1.3422 -0.4875 2.2000 0.0000 0.0000 -25.4792 -5.0792 1.6000 16.1667 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
2005 3 23 55 2.9965 19.5823 0.0000 -1.3189 -0.6538 2.2000 0.0000 0.0000 -38.2188 -5.0792 1.6000 24.2500 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
2005 4 23 55 3.9965 17.3808 0.0000 0.8826 -0.3465 0.8083 0.0000 0.0000 -48.6229 -0.3000 1.4917 32.0833 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
2005 5 23 55 4.9965 18.3519 0.0000 -0.0885 -0.2949 0.1083 0.0000 0.0000 -59.9271 -2.2000 1.5917 41.0833 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
2005 2 23 55 1.9965 19.6056 0.0000 -1.3422 -0.4875 2.2000 0.0000 0.0000 -25.4792 -5.0792 1.6000 8.0833 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
2005 3 23 55 2.9965 19.5823 0.0000 -1.3189 -0.6538 2.2000 0.0000 0.0000 -38.2188 -5.0792 1.6000 8.0833 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
2005 4 23 55 3.9965 17.3808 0.0000 0.8826 -0.3465 0.8083 0.0000 0.0000 -48.6229 -0.3000 1.4917 7.8333 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
2005 5 23 55 4.9965 18.3519 0.0000 -0.0885 -0.2949 0.1083 0.0000 0.0000 -59.9271 -2.2000 1.5917 9.0000 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
55 changes: 42 additions & 13 deletions BenchmarkTest/BaseRun/2018c/Input/InitialConditionstest1_2005.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,46 @@
AlbGrass0= 0.17999999999999999
DecidCap0= 0.29999999999999999
Porosity0= 0.59999999999999998
SoilStorePavedState= 149.99999999999696
SoilStoreBldgsState= 149.99999999999696
SoilStoreEveTrState= 150.00000000000000
SoilStoreDecTrState= 149.99999999999994
SoilStoreGrassState= 149.99999999999994
SoilStoreBSoilState= 149.99999999999994
PavedState= 9.7411506536546288E-002
BldgsState= 9.6221900589035833E-002
EveTrState= 0.14519690483908204
DecTrState= 0.11537373444191372
GrassState= 0.16543283370914175
BSoilState= 0.13178493297024599
WaterState= 20001.439173147857
SoilStorePavedState= 149.83241870445249
SoilStoreBldgsState= 149.83249254312904
SoilStoreEveTrState= 149.75771184179175
SoilStoreDecTrState= 149.78334097191077
SoilStoreGrassState= 149.78330327779130
SoilStoreBSoilState= 149.78327612959140
PavedState= 0.0000000000000000
BldgsState= 0.0000000000000000
EveTrState= 0.0000000000000000
DecTrState= 0.0000000000000000
GrassState= 0.0000000000000000
BSoilState= 0.0000000000000000
WaterState= 8.7456434004889085E-003
SnowWaterPavedState= 5.6770234867508610E-004
SnowWaterBldgsState= 5.6770234867508610E-004
SnowWaterEveTrState= 5.6770234867508610E-004
SnowWaterDecTrState= 5.6770234867508610E-004
SnowWaterGrassState= 5.6770234867508610E-004
SnowWaterBSoilState= 5.6770234867508610E-004
SnowWaterWaterState= 5.6771775192412173E-004
SnowPackPaved= 8.7458964964165879E-003
SnowPackBldgs= 8.7458964964165879E-003
SnowPackEveTr= 8.7458964964165879E-003
SnowPackDecTr= 8.7458964964165879E-003
SnowPackGrass= 8.7458964964165879E-003
SnowPackBSoil= 8.7458964964165879E-003
SnowPackWater= 8.7455611336077124E-003
SnowFracPaved= 1.0000000474974513E-003
SnowFracBldgs= 1.0000000474974513E-003
SnowFracEveTr= 9.2257123039047872E-003
SnowFracDecTr= 9.2257123039047872E-003
SnowFracGrass= 9.2257123039047872E-003
SnowFracBSoil= 1.0000000000000000
SnowFracWater= 1.0000000000000000
SnowDensPaved= 100.25511510040724
SnowDensBldgs= 100.25511510040724
SnowDensEveTr= 100.25511510040724
SnowDensDecTr= 100.25511510040724
SnowDensGrass= 100.25511510040724
SnowDensBSoil= 100.25511510040724
SnowDensWater= 100.24297118079761
SnowAlb0= 0.17999999999999999
/
53 changes: 41 additions & 12 deletions BenchmarkTest/BaseRun/2018c/Input/InitialConditionstest1_2005_EndofRun.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,46 @@
AlbGrass0= 0.17999999999999999
DecidCap0= 0.29999999999999999
Porosity0= 0.59999999999999998
SoilStorePavedState= 149.99999999999696
SoilStoreBldgsState= 149.99999999999696
SoilStoreEveTrState= 150.00000000000000
SoilStoreDecTrState= 149.99999999999994
SoilStoreGrassState= 149.99999999999994
SoilStoreBSoilState= 149.99999999999994
PavedState= 3.5601148914766920E-003
SoilStorePavedState= 149.77301598221106
SoilStoreBldgsState= 149.77303860519589
SoilStoreEveTrState= 149.72977904620086
SoilStoreDecTrState= 149.74124123703083
SoilStoreGrassState= 149.74122327493797
SoilStoreBSoilState= 149.76168281391452
PavedState= 0.0000000000000000
BldgsState= 0.0000000000000000
EveTrState= 0.16329535262274653
DecTrState= 0.11891263221881862
GrassState= 0.19679626165327616
BSoilState= 0.14033140215206197
WaterState= 20006.541888989956
EveTrState= 0.0000000000000000
DecTrState= 0.0000000000000000
GrassState= 0.0000000000000000
BSoilState= 0.0000000000000000
WaterState= 0.0000000000000000
SnowWaterPavedState= 0.0000000000000000
SnowWaterBldgsState= 0.0000000000000000
SnowWaterEveTrState= 0.0000000000000000
SnowWaterDecTrState= 0.0000000000000000
SnowWaterGrassState= 0.0000000000000000
SnowWaterBSoilState= 0.0000000000000000
SnowWaterWaterState= 4.3584337188736795E-004
SnowPackPaved= 0.0000000000000000
SnowPackBldgs= 0.0000000000000000
SnowPackEveTr= 0.0000000000000000
SnowPackDecTr= 0.0000000000000000
SnowPackGrass= 0.0000000000000000
SnowPackBSoil= 0.0000000000000000
SnowPackWater= 0.0000000000000000
SnowFracPaved= 0.0000000000000000
SnowFracBldgs= 0.0000000000000000
SnowFracEveTr= 0.0000000000000000
SnowFracDecTr= 0.0000000000000000
SnowFracGrass= 0.0000000000000000
SnowFracBSoil= 0.0000000000000000
SnowFracWater= 0.0000000000000000
SnowDensPaved= 100.00000000000000
SnowDensBldgs= 100.00000000000000
SnowDensEveTr= 100.00000000000000
SnowDensDecTr= 100.00000000000000
SnowDensGrass= 100.00000000000000
SnowDensBSoil= 100.00000000000000
SnowDensWater= 100.00000000000000
SnowAlb0= 0.0000000000000000
/
7 changes: 7 additions & 0 deletions BenchmarkTest/BaseRun/2018c/Input/InitialConditionstest_2004.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ SoilstoreEveTrstate=150
SoilstoreDecTrState=150
SoilstoreGrassState=150
SoilstoreBSoilState=150
PavedState= 0.0
BldgsState= 0.0
EveTrState= 0.0
DecTrState= 0.0
GrassState= 0.0
BSoilState= 0.0
WaterState= 0.3
SnowPackPaved=1
SnowPackBldgs=1
SnowPackEveTr=1
Expand Down
8 changes: 4 additions & 4 deletions BenchmarkTest/BaseRun/2018c/Output/test1_2004_DailyState.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Year DOY Hour Min Dectime HDD1_h HDD2_c HDD3_Tmean HDD4_T5d P_day DaysSR GDD1_g GDD2_s GDD3_Tmin GDD4_Tmax GDD5_DLHrs LAI_EveTr LAI_DecTr LAI_Grass DecidCap Porosity AlbEveTr AlbDecTr AlbGrass WU_EveTr1 WU_EveTr2 WU_EveTr3 WU_DecTr1 WU_DecTr2 WU_DecTr3 WU_Grass1 WU_Grass2 WU_Grass3 deltaLAI LAIlumps AlbSnow DensSnow_Paved DensSnow_Bldgs DensSnow_EveTr DensSnow_DecTr DensSnow_Grass DensSnow_BSoil DensSnow_Water a1 a2 a3
2004 363 23 55 362.9965 19.5463 0.0000 -1.3463 -1.3463 2.1833 0.0000 0.0000 -12.7396 -5.0792 1.6000 8.0833 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
2004 364 23 55 363.9965 17.3808 0.0000 0.8826 -0.2318 0.8083 0.0000 0.0000 -23.1437 -0.3000 1.4917 15.9167 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
2004 365 23 55 364.9965 18.2216 0.0000 0.0418 -0.1406 0.2000 0.0000 0.0000 -34.4417 -2.1875 1.5917 24.9167 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
2004 366 23 55 365.9965 18.2241 0.0000 0.0393 -0.0956 0.2000 0.0000 0.0000 -45.7396 -2.1875 1.5917 33.9167 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.0000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.4113 0.3039 -30.6575
2004 363 23 55 362.9965 19.5463 0.0000 -1.3463 -1.3463 2.1833 0.0000 0.0000 -12.7396 -5.0792 1.6000 8.0833 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.2896 64.068299 64.068299 64.090532 64.090532 64.090532 64.090532 51.087062 0.3579 0.2538 -25.4617
2004 364 23 55 363.9965 17.3808 0.0000 0.8826 -0.2318 0.8083 0.0000 0.0000 -23.1437 -0.3000 1.4917 7.8333 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.2792 75.923212 75.921102 75.988449 75.987968 75.985080 75.920045 61.756769 0.3666 0.2620 -26.2790
2004 365 23 55 364.9965 18.2216 0.0000 0.0418 -0.1406 0.2000 0.0000 0.0000 -34.4417 -2.1875 1.5917 9.0000 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.2694 100.230826 100.230826 100.230826 100.230826 100.230826 100.230826 72.347168 0.3744 0.2692 -27.0067
2004 366 23 55 365.9965 18.2241 0.0000 0.0393 -0.0956 0.2000 0.0000 0.0000 -45.7396 -2.1875 1.5917 9.0000 4.0000 1.0000 1.6000 0.3000 0.6000 0.1100 0.1200 0.1800 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4907 0.1800 100.230826 100.230826 100.230826 100.230826 100.230826 100.230826 100.218682 0.3744 0.2692 -27.0059
Loading

0 comments on commit 375306b

Please sign in to comment.