-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Compare netCDFs with specified tolerances (c. 1.5e-8 for double and, equivalently, c. 8.5e-5 for float typed netCDF input test runs) - Round inputs to "climate.nc" -- as done for all other nc-inputs already (does not have impact on netCDF content) - Input values for SWRC parameters * Turn off SWRC parameter inputs except for dedicated tests (text-based version by default calculates parameters internally from soil properties using a pedotransfer function) -- even though they were activated in tsv-inputs, the input value for inputsProvideSWRCp (from siteparam.in) turned them off (in favor of calculating the values with a pedotransfer function) * New ncTestRuns that use netCDF inputs for SWRC parameters; the input values for SWRC parameters are now being calculated with the pedotransfer function that is being used internally (instead of copying stored values)
- Loading branch information
Showing
4 changed files
with
136 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,45 +1,47 @@ | ||
id,testrun,tag,comment,expectation,domainType,domainCRS,domainSize,domainSubset,domainLonConvention,domainShift,inputType,inputCRS,inputSize,expectIndexLookup,inWeather,calendarWeather,simStartYear,simEndYear,pft,inputVarType,inputDimOrder,inputSoilProfile | ||
1,1,dom-s-1-geog_in-s-geog-1,example,success,s,geographic,1,NA,180,NA,s,geographic,1,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
2,5,dom-s-1-proj_in-s-geog-1,SpatialCombination-5,success,s,projected,1,NA,NA,NA,s,geographic,1,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
3,11,dom-xy-1x1-geog_in-xy-geog-1x1,SpatialCombination-11,success,xy,geographic,1x1,NA,180,NA,xy,geographic,1x1,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
4,15,dom-xy-1x1-proj_in-xy-geog-1x1,SpatialCombination-15,success,xy,projected,1x1,NA,NA,NA,xy,geographic,1x1,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
5,2,dom-s-1-geog_in-s-proj,SpatialCombination-2,error,s,geographic,1,NA,180,NA,s,projected,1,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
6,3,dom-s-1-geog_in-xy-geog-1x1,SpatialCombination-3,success,s,geographic,1,NA,180,NA,xy,geographic,1x1,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
7,4,dom-s-1-geog_in-xy-proj-1x1,SpatialCombination-4,error,s,geographic,1,NA,180,NA,xy,projected,1x1,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
8,6,dom-s-1-proj_in-s-proj,SpatialCombination-6,success,s,projected,1,NA,NA,NA,s,projected,1,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
9,7,dom-s-1-proj_in-xy-geog-1x1,SpatialCombination-7,success,s,projected,1,NA,NA,NA,xy,geographic,1x1,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
10,8,dom-s-1-proj_in-xy-proj-1x1,SpatialCombination-8,success,s,projected,1,NA,NA,NA,xy,projected,1x1,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
11,9,dom-xy-1x1-geog_in-s-geog,SpatialCombination-9,error,xy,geographic,1x1,NA,180,NA,s,geographic,1,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
12,10,dom-xy-1x1-geog_in-s-proj,SpatialCombination-10,error,xy,geographic,1x1,NA,180,NA,s,projected,1,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
13,12,dom-xy-1x1-geog_in-xy-proj-1x1,SpatialCombination-12,error,xy,geographic,1x1,NA,180,NA,xy,projected,1x1,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
14,13,dom-xy-1x1-proj_in-s-geog,SpatialCombination-13,error,xy,projected,1x1,NA,NA,NA,s,geographic,1,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
15,14,dom-xy-1x1-proj_in-s-proj,SpatialCombination-14,error,xy,projected,1x1,NA,NA,NA,s,projected,1,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
16,16,dom-xy-1x1-proj_in-xy-proj-1x1,SpatialCombination-16,success,xy,projected,1x1,NA,NA,NA,xy,projected,1x1,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
17,17,dom-s-1-geog_in-s-geog-1-noleap,noleap calendar,success,s,geographic,1,NA,180,NA,s,geographic,1,0,sw2,noleap,1980,2010,dim,double,standard,standard | ||
18,18,dom-s-1-geog_in-s-geog-1-allleap,allleap calendar,success,s,geographic,1,NA,180,NA,s,geographic,1,0,sw2,allleap,1980,2010,dim,double,standard,standard | ||
19,19,dom-s-1-geog_in-s-geog-1-float,float instead of double as input,success,s,geographic,1,NA,180,NA,s,geographic,1,0,sw2,standard,1980,2010,dim,float,standard,standard | ||
20,24,dom-xy-3x2-geog_in-xy-geog-3x2,gridded geographic,success,xy,geographic,3x2,NA,180,NA,xy,geographic,3x2,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
21,25,dom-xy-3x2-geog-shifted_in-xy-geog-3x2,gridded geographic shifted out-of-inputs,error,xy,geographic,3x2,NA,180,10;5,xy,geographic,3x2,1,sw2,standard,1980,2010,dim,double,standard,standard | ||
22,26,dom-xy-3x2-proj_in-xy-proj-3x2,gridded projected,success,xy,projected,3x2,NA,NA,NA,xy,projected,3x2,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
23,27,dom-xy-3x2-proj-subset_in-xy-proj-3x2,gridded projected subset,success,xy,projected,3x2,3;5,NA,NA,xy,projected,3x2,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
24,20,dom-xy-1x2-geog_in-xy-geog-3x2,gridded+lookup geographic,success,xy,geographic,1x2,NA,180,NA,xy,geographic,3x2,1,sw2,standard,1980,2010,dim,double,standard,standard | ||
25,21,dom-xy-1x2-geog-lon360_in-xy-geog-3x2,gridded+lookup geographic lon0-360,success,xy,geographic,1x2,NA,360,NA,xy,geographic,3x2,1,sw2,standard,1980,2010,dim,double,standard,standard | ||
26,22,dom-xy-1x2-proj_in-xy-proj-3x2,gridded+lookup projected,success,xy,projected,1x2,NA,NA,NA,xy,projected,3x2,1,sw2,standard,1980,2010,dim,double,standard,standard | ||
27,23,dom-xy-1x2-proj-lon360_in-xy-geog-3x2,gridded+lookup projected lon0-360,success,xy,projected,1x2,NA,360,NA,xy,geographic,3x2,1,sw2,standard,1980,2010,dim,double,standard,standard | ||
28,28,dom-xy-3x2-geog_in-xy-geog-3x2-pftvar,pft as variable instead dimension,success,xy,geographic,3x2,NA,180,NA,xy,geographic,3x2,0,sw2,standard,1980,2010,var,double,standard,standard | ||
29,29,dom-xy-3x2-geog_in-xy-geog-3x2-mixdim,"gridded geographic, mixed order of input dimensions",success,xy,geographic,3x2,NA,180,NA,xy,geographic,3x2,0,sw2,standard,1980,2010,dim,double,mix,standard | ||
30,30,dom-xy-3x2-geog_in-xy-geog-3x2-soillayers,variable number of soil layers,success,xy,geographic,3x2,NA,180,NA,xy,geographic,3x2,0,sw2,standard,1980,2010,dim,double,standard,variableSoilLayerNumber | ||
31,31,dom-xy-3x2-geog_in-xy-geog-3x2-soildepths,variable soil layer thickness,success,xy,geographic,3x2,NA,180,NA,xy,geographic,3x2,0,sw2,standard,1980,2010,dim,double,standard,variableSoilLayerThickness | ||
32,36,dom-s-6-geog_in-s-geog-6,site geographic,success,s,geographic,6,NA,180,NA,s,geographic,6,0,sw2,standard,1980,2010,dim,double,standard,standard | ||
33,37,dom-s-6-geog_in-s-geog-6-pftvar,pft as variable instead dimension,success,s,geographic,6,NA,180,NA,s,geographic,6,0,sw2,standard,1980,2010,var,double,standard,standard | ||
34,38,dom-s-6-geog_in-s-geog-6-mixdim,"site geographic, mixed order of input dimensions",success,s,geographic,6,NA,180,NA,s,geographic,6,0,sw2,standard,1980,2010,dim,double,mix,standard | ||
35,39,dom-s-6-geog_in-s-geog-6-soillayers,variable number of soil layers,success,s,geographic,6,NA,180,NA,s,geographic,6,0,sw2,standard,1980,2010,dim,double,standard,variableSoilLayerNumber | ||
36,40,dom-s-6-geog_in-s-geog-6-soildepths,variable soil layer thickness,success,s,geographic,6,NA,180,NA,s,geographic,6,0,sw2,standard,1980,2010,dim,double,standard,variableSoilLayerThickness | ||
37,32,dom-s-6-geog_in-xy-geog-3x2,site-gridded geographic,success,s,geographic,6,NA,180,NA,xy,geographic,3x2,1,sw2,standard,1980,2010,dim,double,standard,standard | ||
38,33,dom-s-6-geog-shifted_in-xy-geog-3x2,site-gridded geographic shifted out-of-inputs,error,s,geographic,6,NA,180,10;5,xy,geographic,3x2,1,sw2,standard,1980,2010,dim,double,standard,standard | ||
39,34,dom-s-6-geog-subset_in-xy-geog-3x2,site-gridded geographic subset,success,s,geographic,6,3;5,180,NA,xy,geographic,3x2,1,sw2,standard,1980,2010,dim,double,standard,standard | ||
40,35,dom-s-6-proj_in-xy-proj-3x2,site-gridded projected,success,s,projected,6,NA,NA,NA,xy,projected,3x2,1,sw2,standard,1980,2010,dim,double,standard,standard | ||
41,41,dom-xy-3x2-geog_in-xy-geog-gridMET-3x2,gridMET,success,xy,geographic,3x2,NA,180,NA,xy,geographic,3x2,1,gridMET,NA,1980,2010,dim,double,standard,standard | ||
42,42,dom-xy-3x2-geog_in-xy-geog-MACAv2METDATA-3x2,MACAv2METDATA,success,xy,geographic,3x2,NA,180,NA,xy,geographic,3x2,1,MACAv2METDATA,NA,1980,2005,dim,double,standard,standard | ||
43,43,dom-xy-3x2-geog_in-xy-geog-Daymet-3x2,Daymet-geographic,success,xy,geographic,3x2,NA,180,NA,xy,geographic,3x2,1,Daymet,NA,1980,2010,dim,double,standard,standard | ||
44,44,dom-xy-3x2-proj_in-xy-proj-Daymet-3x2,Daymet-projected,success,xy,projected,3x2,NA,NA,NA,xy,projected,3x2,1,Daymet,NA,1980,2010,dim,double,standard,standard | ||
id,testrun,tag,comment,expectation,domainType,domainCRS,domainSize,domainSubset,domainLonConvention,domainShift,inputType,inputCRS,inputSize,expectIndexLookup,inWeather,calendarWeather,simStartYear,simEndYear,pft,inputVarType,inputDimOrder,inputSoilProfile,inputsProvideSWRCp | ||
1,1,dom-s-1-geog_in-s-geog-1,example,success,s,geographic,1,NA,180,NA,s,geographic,1,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
2,5,dom-s-1-proj_in-s-geog-1,SpatialCombination-5,success,s,projected,1,NA,NA,NA,s,geographic,1,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
3,11,dom-xy-1x1-geog_in-xy-geog-1x1,SpatialCombination-11,success,xy,geographic,1x1,NA,180,NA,xy,geographic,1x1,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
4,15,dom-xy-1x1-proj_in-xy-geog-1x1,SpatialCombination-15,success,xy,projected,1x1,NA,NA,NA,xy,geographic,1x1,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
5,2,dom-s-1-geog_in-s-proj,SpatialCombination-2,error,s,geographic,1,NA,180,NA,s,projected,1,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
6,3,dom-s-1-geog_in-xy-geog-1x1,SpatialCombination-3,success,s,geographic,1,NA,180,NA,xy,geographic,1x1,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
7,4,dom-s-1-geog_in-xy-proj-1x1,SpatialCombination-4,error,s,geographic,1,NA,180,NA,xy,projected,1x1,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
8,6,dom-s-1-proj_in-s-proj,SpatialCombination-6,success,s,projected,1,NA,NA,NA,s,projected,1,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
9,7,dom-s-1-proj_in-xy-geog-1x1,SpatialCombination-7,success,s,projected,1,NA,NA,NA,xy,geographic,1x1,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
10,8,dom-s-1-proj_in-xy-proj-1x1,SpatialCombination-8,success,s,projected,1,NA,NA,NA,xy,projected,1x1,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
11,9,dom-xy-1x1-geog_in-s-geog,SpatialCombination-9,error,xy,geographic,1x1,NA,180,NA,s,geographic,1,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
12,10,dom-xy-1x1-geog_in-s-proj,SpatialCombination-10,error,xy,geographic,1x1,NA,180,NA,s,projected,1,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
13,12,dom-xy-1x1-geog_in-xy-proj-1x1,SpatialCombination-12,error,xy,geographic,1x1,NA,180,NA,xy,projected,1x1,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
14,13,dom-xy-1x1-proj_in-s-geog,SpatialCombination-13,error,xy,projected,1x1,NA,NA,NA,s,geographic,1,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
15,14,dom-xy-1x1-proj_in-s-proj,SpatialCombination-14,error,xy,projected,1x1,NA,NA,NA,s,projected,1,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
16,16,dom-xy-1x1-proj_in-xy-proj-1x1,SpatialCombination-16,success,xy,projected,1x1,NA,NA,NA,xy,projected,1x1,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
17,17,dom-s-1-geog_in-s-geog-1-noleap,noleap calendar,success,s,geographic,1,NA,180,NA,s,geographic,1,0,sw2,noleap,1980,2010,dim,double,standard,standard,FALSE | ||
18,18,dom-s-1-geog_in-s-geog-1-allleap,allleap calendar,success,s,geographic,1,NA,180,NA,s,geographic,1,0,sw2,allleap,1980,2010,dim,double,standard,standard,FALSE | ||
19,19,dom-s-1-geog_in-s-geog-1-float,float instead of double as input,success,s,geographic,1,NA,180,NA,s,geographic,1,0,sw2,standard,1980,2010,dim,float,standard,standard,FALSE | ||
20,24,dom-xy-3x2-geog_in-xy-geog-3x2,gridded geographic,success,xy,geographic,3x2,NA,180,NA,xy,geographic,3x2,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
21,25,dom-xy-3x2-geog-shifted_in-xy-geog-3x2,gridded geographic shifted out-of-inputs,error,xy,geographic,3x2,NA,180,10;5,xy,geographic,3x2,1,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
22,26,dom-xy-3x2-proj_in-xy-proj-3x2,gridded projected,success,xy,projected,3x2,NA,NA,NA,xy,projected,3x2,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
23,27,dom-xy-3x2-proj-subset_in-xy-proj-3x2,gridded projected subset,success,xy,projected,3x2,3;5,NA,NA,xy,projected,3x2,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
24,20,dom-xy-1x2-geog_in-xy-geog-3x2,gridded+lookup geographic,success,xy,geographic,1x2,NA,180,NA,xy,geographic,3x2,1,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
25,21,dom-xy-1x2-geog-lon360_in-xy-geog-3x2,gridded+lookup geographic lon0-360,success,xy,geographic,1x2,NA,360,NA,xy,geographic,3x2,1,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
26,22,dom-xy-1x2-proj_in-xy-proj-3x2,gridded+lookup projected,success,xy,projected,1x2,NA,NA,NA,xy,projected,3x2,1,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
27,23,dom-xy-1x2-proj-lon360_in-xy-geog-3x2,gridded+lookup projected lon0-360,success,xy,projected,1x2,NA,360,NA,xy,geographic,3x2,1,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
28,28,dom-xy-3x2-geog_in-xy-geog-3x2-pftvar,pft as variable instead dimension,success,xy,geographic,3x2,NA,180,NA,xy,geographic,3x2,0,sw2,standard,1980,2010,var,double,standard,standard,FALSE | ||
29,29,dom-xy-3x2-geog_in-xy-geog-3x2-mixdim,"gridded geographic, mixed order of input dimensions",success,xy,geographic,3x2,NA,180,NA,xy,geographic,3x2,0,sw2,standard,1980,2010,dim,double,mix,standard,FALSE | ||
30,30,dom-xy-3x2-geog_in-xy-geog-3x2-soillayers,variable number of soil layers,success,xy,geographic,3x2,NA,180,NA,xy,geographic,3x2,0,sw2,standard,1980,2010,dim,double,standard,variableSoilLayerNumber,FALSE | ||
31,31,dom-xy-3x2-geog_in-xy-geog-3x2-soildepths,variable soil layer thickness,success,xy,geographic,3x2,NA,180,NA,xy,geographic,3x2,0,sw2,standard,1980,2010,dim,double,standard,variableSoilLayerThickness,FALSE | ||
32,32,dom-xy-3x2-geog_in-xy-geog-3x2-swrcp,input SWRCp,success,xy,geographic,3x2,NA,180,NA,xy,geographic,3x2,0,sw2,standard,1980,2010,dim,double,standard,standard,TRUE | ||
33,37,dom-s-6-geog_in-s-geog-6,site geographic,success,s,geographic,6,NA,180,NA,s,geographic,6,0,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
34,38,dom-s-6-geog_in-s-geog-6-pftvar,pft as variable instead dimension,success,s,geographic,6,NA,180,NA,s,geographic,6,0,sw2,standard,1980,2010,var,double,standard,standard,FALSE | ||
35,39,dom-s-6-geog_in-s-geog-6-mixdim,"site geographic, mixed order of input dimensions",success,s,geographic,6,NA,180,NA,s,geographic,6,0,sw2,standard,1980,2010,dim,double,mix,standard,FALSE | ||
36,40,dom-s-6-geog_in-s-geog-6-soillayers,variable number of soil layers,success,s,geographic,6,NA,180,NA,s,geographic,6,0,sw2,standard,1980,2010,dim,double,standard,variableSoilLayerNumber,FALSE | ||
37,41,dom-s-6-geog_in-s-geog-6-soildepths,variable soil layer thickness,success,s,geographic,6,NA,180,NA,s,geographic,6,0,sw2,standard,1980,2010,dim,double,standard,variableSoilLayerThickness,FALSE | ||
38,41,dom-s-6-geog_in-s-geog-6-swrcp,input SWRCp,success,s,geographic,6,NA,180,NA,s,geographic,6,0,sw2,standard,1980,2010,dim,double,standard,standard,TRUE | ||
39,34,dom-s-6-geog_in-xy-geog-3x2,site-gridded geographic,success,s,geographic,6,NA,180,NA,xy,geographic,3x2,1,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
40,35,dom-s-6-geog-shifted_in-xy-geog-3x2,site-gridded geographic shifted out-of-inputs,error,s,geographic,6,NA,180,10;5,xy,geographic,3x2,1,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
41,36,dom-s-6-geog-subset_in-xy-geog-3x2,site-gridded geographic subset,success,s,geographic,6,3;5,180,NA,xy,geographic,3x2,1,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
42,37,dom-s-6-proj_in-xy-proj-3x2,site-gridded projected,success,s,projected,6,NA,NA,NA,xy,projected,3x2,1,sw2,standard,1980,2010,dim,double,standard,standard,FALSE | ||
43,43,dom-xy-3x2-geog_in-xy-geog-gridMET-3x2,gridMET,success,xy,geographic,3x2,NA,180,NA,xy,geographic,3x2,1,gridMET,NA,1980,2010,dim,double,standard,standard,FALSE | ||
44,44,dom-xy-3x2-geog_in-xy-geog-MACAv2METDATA-3x2,MACAv2METDATA,success,xy,geographic,3x2,NA,180,NA,xy,geographic,3x2,1,MACAv2METDATA,NA,1980,2005,dim,double,standard,standard,FALSE | ||
45,45,dom-xy-3x2-geog_in-xy-geog-Daymet-3x2,Daymet-geographic,success,xy,geographic,3x2,NA,180,NA,xy,geographic,3x2,1,Daymet,NA,1980,2010,dim,double,standard,standard,FALSE | ||
46,46,dom-xy-3x2-proj_in-xy-proj-Daymet-3x2,Daymet-projected,success,xy,projected,3x2,NA,NA,NA,xy,projected,3x2,1,Daymet,NA,1980,2010,dim,double,standard,standard,FALSE |
Oops, something went wrong.