Skip to content

Commit

Permalink
Merge pull request #28 from NCAR/devel
Browse files Browse the repository at this point in the history
Merging Version 0.1 into master
  • Loading branch information
Kevin Paul authored Aug 17, 2016
2 parents 9aad9d7 + 0ba41ed commit 9f814f6
Show file tree
Hide file tree
Showing 89 changed files with 11,802 additions and 75 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.spec
*.pyc
*.nc
17 changes: 17 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>PyConform</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.python.pydev.PyDevBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.python.pydev.pythonNature</nature>
</natures>
</projectDescription>
9 changes: 9 additions & 0 deletions .pydevproject
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?><pydev_project>

<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Homebrew Python 2.7</pydev_property>
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
<path>/${PROJECT_DIR_NAME}/source</path>
</pydev_pathproperty>
</pydev_project>
12 changes: 12 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@ See the LICENSE.rst file for details

VERSION 0.0.1
-------------
06 Jan 2016:
- Add date check/mapping ability.

19 Nov 2015:
- Added initial CESM to CMIP6 JSON tables to the examples directory.
- Added the code within examples/CESM/CMIP6/src used to generate these tables.

18 Nov 2015:
- Added initial CESM to CMIP5 JSON tables to examples directory

17 Nov 2015:
- Add initial version of mip_table_parser.py.

03 Nov 2015:
- Add initial versions of climIO.py and its unit test.
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ A package for transforming a NetCDF dataset into a defined format
suitable for publication according to a defined publication standard.

:AUTHORS: Sheri Mickelson, Kevin Paul
:COPYRIGHT: 2015, University Corporation for Atmospheric Research
:COPYRIGHT: 2016, University Corporation for Atmospheric Research
:LICENSE: See the LICENSE.rst file for details

Send questions and comments to Kevin Paul ([email protected]) or
Expand Down
23 changes: 23 additions & 0 deletions examples/CESM/CMIP5/CMIP5_3hr.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
"clt=CLDTOT unit conversion"
"hfls=LHFLX no change"
"hfss=SHFLX no change"
"huss=QREFHT no change"
"mrro=UNAVAILABLE"
"mrsos=UNAVAILABLE"
"pr=PRECC + PRECL and unit conversion"
"prc=PRECC unit conversion"
"prsn=PRECSC + PRECSL and unit conversion"
"ps=PS no change"
"rlds=FLDS no change"
"rldscs=FLDSC no change"
"rlus=FLDS + FLNS"
"rsds=FSDS no change"
"rsdsdiff=UNAVAILABLE"
"rsdscs=FSDSC no change"
"rsus=FSDS - FSNS"
"rsuscs=Would be FSDSC - FSNSC"
"tslsi=UNAVAILABLE"
"tso=UNAVAILABLE"
"tas=TREFHT no change"
"uas=UNAVAILABLE"
"vas=UNAVAILABLE"
5 changes: 5 additions & 0 deletions examples/CESM/CMIP5/CMIP5_6hrLev.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
"hus=Q no change"
"ps=PS no change"
"ta=T no change"
"ua=U no change"
"va=V no change"
4 changes: 4 additions & 0 deletions examples/CESM/CMIP5/CMIP5_6hrPlev.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
"psl=PSL no change"
"ta=T interpolated to standard plev3"
"ua=U interpolated to standard plev3"
"va=V interpolated to standard plev3"
77 changes: 77 additions & 0 deletions examples/CESM/CMIP5/CMIP5_Amon.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
"ccb=UNAVAILABLE"
"cct=UNAVAILABLE"
"cfc113global=UNKNOWN"
"cfc11global=f11vmr convert to mass"
"cfc12global=f12vmr convert to mass"
"ch4=CH4 interpolated to standard plevs"
"ch4Clim=UNKNOWN"
"ch4global=ch4vmr convert to mass"
"ch4globalClim=UNKNOWN"
"ci=FREQZM unit conversion" (*** cannot find the conversion in code)
"cl=CLOUD on model levels, no change"
"cli=CLDICE on model levels, no change"
"clivi=TGCLDIWP no change"
"clt=CLDTOT unit conversion" (*** cannot find the conversion in code)
"clw=CLDLIQ on model levels, no change"
"clwvi=TGCLDLWP no change"
"co2=CO2 interpolated to standard plevs, scaled by 28.966/44"
"co2Clim=UNKNOWN"
"co2mass=co2vmr convert to mass"
"co2massClim=UNKNOWN"
"evspsbl=QFLX no change"
"fco2antt=UNKNOWN"
"fco2fos=UNKNOWN"
"fco2nat=UNKNOWN"
"hcfc22global=UNKNOWN"
"hfls=LHFLX no change"
"hfss=SHFLX no change"
"hur=RELHUM interpolated to standard plevs"
"hurs=RHREFHT no change"
"hus=Q interpolated to standard plevs"
"huss=QREFHT no change"
"mc=CMFMC + CMFMCDZM on model levels, no change"
"n2o=N2O interpolated to standard plevs"
"n2oClim=UNKNOWN"
"n2oglobal=n2ovmr convert to mass"
"n2oglobalClim=UNKNOWN"
"prAdjust=UNKNOWN"
"pr=PRECC + PRECL and unit conversion from m s-1 to kg m-2 s-1"
"prc=PRECC unit conversion from m s-1 to kg m-2 s-1"
"prsn=PRECSC + PRECSL and unit conversion from m s-1 to kg m-2 s-1"
"prw=TMQ no change"
"ps=PS no change"
"pslAdjust=UNKNOWN"
"psl=PSL no change"
"rlds=FLDS no change"
"rldscs=FLDSC no change"
"rlus=FLDS + FLNS"
"rlut=FSNTOA-FSNT+FLNT"
"rlutcs=FLUTC no change"
"rsds=FSDS no change"
"rsdscs=FSDSC no change"
"rsdt=SOLIN no change"
"rsus=FSDS - FSNS"
"rsuscs=FSDSC - FSNSC"
"rsut=SOLIN - FSNTOA"
"rsutcs=SOLIN - FSNTOAC"
"rtmt=FSNT - FLNT"
"sbl=UNAVAILABLE"
"sci=FREQSH no change"
"sfcWind=U10 no change"
"ta=T interpolated to standard plevs"
"tasAdjust=UNKNOWN"
"tas=TREFHT no change"
"tasmax=TREFMXAV no change"
"tasmin=TREFMNAV no change"
"tauu=TAUX no change"
"tauv=TAUY no change"
"tro3=O3 interpolated to standard plevs"
"tro3Clim=UNKNOWN"
"tsAdjust=UNKNOWN"
"ts=TS no change"
"ua=U interpolated to standard plevs"
"uas=UNAVAILABLE"
"va=V interpolated to standard plevs"
"vas=UNAVAILABLE"
"wap=OMEGA interpolated to standard plevs"
"zg=Z3 interpolated to standard plevs"
12 changes: 12 additions & 0 deletions examples/CESM/CMIP5/CMIP5_LImon.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
"agesno=UNAVAILABLE"
"hfdsn=FGR"
"lwsnl=SNOWLIQ no change"
"pflw=UNAVAILABLE"
"sbl=would be QFLX_SUB_SNOW"
"snc=FSNO, mulitply by 100 to get percentage"
"snd=SNOWDP unchanged"
"snm=QMELT, unit change from mm s-1 to kg m-2 s-1, same numerical value"(where (indat2a /= var_info(var_found(1,1))%missing_value), else 0)
"snw=H2OSNO, unit change from mm to kg m-2, same numerical value"
"sootsn=SNOBCMSL + SNODSTMSL + SNOOCMSL"
"tpf=UNAVAILABLE"
"tsn=would be SNOTTOPL"
59 changes: 59 additions & 0 deletions examples/CESM/CMIP5/CMIP5_Lmon.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
"baresoilFrac=UNAVAILABLE"
"burntArea=ANN_FAREA_BURNED, unit change 'proportion' to percentage *100."
"c3PftFrac=UNAVAILABLE"
"c4PftFrac=UNAVAILABLE"
"cCwd=CWDC, Unit change - grams to kg"
"cLeaf=LEAFC, Unit change - grams to kg"
"cLitterAbove=UNAVAILABLE"
"cLitterBelow=UNAVAILABLE"
"cLitter=TOTLITC, Unit change - grams to kg"
"cMisc=STORVEGC, Unit change - grams to kg"
"cProduct=TOTPRODC, Unit change - grams to kg"
"cRoot=FROOTC+LIVE_ROOTC+DEAD_ROOTC, Unit change - grams to kg"
"cropFrac=UNAVAILABLE"
"cSoilFast=SOIL1C+SOIL2C, Unit change - grams to kg"
"cSoil=TOTSOMC, Unit change - grams to kg"
"cSoilMedium=SOIL3C, Unit change - grams to kg"
"cSoilSlow=SOIL4C, Unit change - grams to kg"
"cVeg=TOTVEGC, Unit change - grams to kg"
"cWood=WOODC, Unit change - grams to kg"
"evspsblsoi=QSOIL"
"evspsblveg=QVEGE"
"fFire=COL_FIRE_CLOSS, Unit change - grams to kg"
"fGrazing=UNAVAILABLE"
"fHarvest=UNAVAILABLE"
"fLitterSoil=LITR1C_TO_SOIL1C+LITR2C_TO_SOIL2C+LITR3C_TO_SOIL3C, Unit change - grams to kg"
"fLuc=DWT_CLOSS+PRODUCT_CLOSS, Unit change - grams to kg"
"fVegLitter=LITFALL, Unit change - grams to kg"
"fVegSoil=UNAVAILABLE"
"gpp=GPP, Unit change - grams to kg"
"grassFrac=UNAVAILABLE"
"lai=TLAI"
"landCoverFrac=UNAVAILABLE"
"mrfso=SOILICE integrated over all layers"
"mrlsl=SOILLIQ + SOILICE at each soil depth"
"mrro=QRUNOFF"
"mrros=QOVER"
"mrso=SOILICE+SOILLIQ, mask over ice-covered regions at 5000 kg m-2"
"mrsos=SOILWATER_10CM"
"nbp=NBP, Unit change - grams to kg"
"nep=UNKNOWN"
"npp=NPP, Unit change - grams to kg"
"nppLeaf=LEAFC_ALLOC, Unit change - grams to kg"
"nppRoot=FROOTC_ALLOC, Unit change - grams to kg"
"nppWood=WOODC_ALLOC, Unit change - grams to kg"
"pastureFrac=UNAVAILABLE"
"prveg=QINTR"
"ra=AR, Unit change - grams to kg"
"residualFrac=UNAVAILABLE"
"rGrowth=GR, Unit change - grams to kg"
"rh=HR, Unit change - grams to kg"
"rMaint=MR, Unit change - grams to kg"
"shrubFrac=UNAVAILABLE"
"tran=QSOIL + QVEGT"
"treeFrac=UNAVAILABLE"
"treeFracPrimDec=UNAVAILABLE"
"treeFracPrimEver=UNAVAILABLE"
"treeFracSecDec=UNAVAILABLE"
"treeFracSecEver=UNAVAILABLE"
"tsl=TSOI"
40 changes: 40 additions & 0 deletions examples/CESM/CMIP5/CMIP5_OImon.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
"ageice=UNAVAILABLE"
"bmelt=meltb, (divide by 86400 s day-1, divide by 100 cm m-1, times 1000 kg m-3)/8640"
"divice=divu" ?????
"eshrice=UNAVAILABLE"
"evap=evap_ai, (divide by 86400 s day-1, divide by 100 cm m-1, times 1000 kg m-3)/8640"
"grCongel=congel, (divide by 86400 s day-1, divide by 100 cm m-1, times 1000 kg m-3)/8640"
"grFrazil=frazil, (divide by 86400 s day-1, divide by 100 cm m-1, times 1000 kg m-3)/8640"
"grLateral=UNAVAILABLE"
"hcice=UNAVAILABLE"
"hflssi=flat_ai"
"hfssi=fsens_ai"
"ialb=UNAVAILABLE"
"nshrice=UNAVAILABLE"
"pr=rain_ai, (divide by 86400 s day-1, divide by 100 cm m-1, times 1000 kg m-3)/8640"
"prsn=snow_ai, (divide by 86400 s day-1, divide by 100 cm m-1, times 1000 kg m-3)/8640"
"ridgice=UNAVAILABLE"
"rldssi=flwdn"
"rlussi=flwup"
"rsdssi=fswdn"
"rsussi=UNAVAILABLE"
"sblsi=UNAVAILABLE"
"sic=aice" ?????
"sim=UNAVAILABLE"
"sit=hi unchanged" ?????
"snc=UNAVAILABLE"
"snd=hs" ?????
"snomelt=melts, (divide by 86400 s day-1, divide by 100 cm m-1, times 1000 kg m-3)/8640"
"snoToIce=snoice, (divide by 86400 s day-1, divide by 100 cm m-1, times 1000 kg m-3)/8640"
"ssi=UNAVAILABLE"
"strairx=strairx"
"strairy=strairy"
"streng=strength" ?????
"strocnx=strocnx" ?????
"strocny=strocny" ?????
"tmelt=meltt, (divide by 86400 s day-1, divide by 100 cm m-1, times 1000 kg m-3)/8640"
"transifs=UNAVAILABLE"
"transix=UNAVAILABLE"
"transiy=UNAVAILABLE"
"tsice=Tsfc" ?????
"tsnint=UNAVAILABLE"
32 changes: 32 additions & 0 deletions examples/CESM/CMIP5/CMIP5_Oclim.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
"difmxybo2d=UNKNOWN"
"difmxybo=UNKNOWN"
"difmxylo2d=UNKNOWN"
"difmxylo=UNKNOWN"
"diftrbbo2d=UNKNOWN"
"diftrbbo=UNKNOWN"
"diftrblo2d=UNKNOWN"
"diftrblo=UNKNOWN"
"diftrebo2d=UNKNOWN"
"diftrebo=UNKNOWN"
"diftrelo2d=UNKNOWN"
"diftrelo=UNKNOWN"
"diftrxybo2d=UNKNOWN"
"diftrxybo=UNKNOWN"
"diftrxylo2d=UNKNOWN"
"diftrxylo=UNKNOWN"
"difvho=UNKNOWN"
"difvmbo=UNKNOWN"
"difvmfdo=UNKNOWN"
"difvmo=UNKNOWN"
"difvmto=UNKNOWN"
"difvso=UNKNOWN"
"difvtrbo=UNKNOWN"
"difvtrto=UNKNOWN"
"dispkevfo=UNKNOWN"
"dispkexyfo2d=UNKNOWN"
"dispkexyfo=UNKNOWN"
"tnkebto2d=UNKNOWN"
"tnkebto=UNKNOWN"
"tnpeo=UNKNOWN"
"tnpeotb=UNKNOWN"
"tnpeot=UNKNOWN"
Loading

0 comments on commit 9f814f6

Please sign in to comment.