archive-gh-me/MeteoInfo
1
0
Fork 0
mirror of https://github.com/meteoinfo/MeteoInfo.git synced 2025-12-08 20:36:05 +00:00
Code Issues Projects Releases Wiki Activity

bugfix in midata and miio modules

Browse Source
This commit is contained in:
wyq 2023-01-14 18:03:38 +08:00
parent 87f4309869
commit 7d145efe9f
4 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meteoinfo-lab/milconfig.xml
View File

@ -1,36 +1,32 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<MeteoInfo File="milconfig.xml" Type="configurefile"> <MeteoInfo File="milconfig.xml" Type="configurefile">
<Path OpenPath="D:\Working\MIScript\Jython\mis\common_math\stats"> <Path OpenPath="D:\Working\MIScript\Jython\mis\io\dataconvert">
<RecentFolder Folder="D:\MyProgram\java\MeteoInfoDev\toolbox\EMIPS\emips"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\grads"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\annotate"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\annotate"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\arrow"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\arrow"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\bar"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\bar"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\boxplot"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\boxplot"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\funny"/>
<RecentFolder Folder="D:\MyProgram\java\MeteoInfoDev\toolbox\EMIPS\emips\gui"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\emips"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math\stats"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math\stats"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\funny"/>
<RecentFolder Folder="D:\MyProgram\java\MeteoInfoDev\toolbox\EMIPS\emips\gui"/>
<RecentFolder Folder="D:\MyProgram\java\MeteoInfoDev\toolbox\EMIPS\emips"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\emips"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\dataconvert"/>
</Path> </Path>
<File> <File>
<OpenedFiles> <OpenedFiles>
<OpenedFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\EMIPS\emips\gui\main_gui.py"/> <OpenedFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\EMIPS\emips\gui\main_gui.py"/>
<OpenedFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\EMIPS\emips\gui\_reload.py"/> <OpenedFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\EMIPS\emips\gui\_reload.py"/>
<OpenedFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\EMIPS\emips\gui\emission_panel.py"/> <OpenedFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\EMIPS\emips\gui\emission_panel.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\common_math\stats\jenks_breaks.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\common_math\stats\jenks_breaks_2.py"/>
</OpenedFiles> </OpenedFiles>
<RecentFiles> <RecentFiles>
<RecentFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\EMIPS\emips\gui\main_gui.py"/> <RecentFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\EMIPS\emips\gui\main_gui.py"/>
<RecentFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\EMIPS\emips\gui\_reload.py"/> <RecentFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\EMIPS\emips\gui\_reload.py"/>
<RecentFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\EMIPS\emips\gui\emission_panel.py"/> <RecentFile File="D:\MyProgram\java\MeteoInfoDev\toolbox\EMIPS\emips\gui\emission_panel.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\common_math\stats\jenks_breaks.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\common_math\stats\jenks_breaks_2.py"/>
</RecentFiles> </RecentFiles>
</File> </File>
<Font> <Font>

BIN
meteoinfo-lab/pylib/mipylib/dataset/midata$py.class
View File

Binary file not shown.

18
meteoinfo-lab/pylib/mipylib/dataset/midata.py
View File

@ -620,7 +620,7 @@ def convert2nc(infn, outfn, version='netcdf3', writedimvar=False, largefile=Fals
#Add dimensions #Add dimensions
dims = [] dims = []
dimnames = [] dimnames = []
for dim in f.dimensions(): for dim in f.dimensions:
dimname = dim.getShortName() dimname = dim.getShortName()
if not dimname in dimnames: if not dimname in dimnames:
dims.append(ncfile.adddim(dimname, dim.getLength())) dims.append(ncfile.adddim(dimname, dim.getLength()))
@ -634,8 +634,8 @@ def convert2nc(infn, outfn, version='netcdf3', writedimvar=False, largefile=Fals
tvar = None tvar = None
if writedimvar: if writedimvar:
dimvars = [] dimvars = []
for i in range(len(f.dimensions())): for i in range(len(f.dimensions)):
dim = f.dimensions()[i] dim = f.dimensions[i]
dname = dim.getShortName() dname = dim.getShortName()
if dim.getDimType() == DimensionType.T: if dim.getDimType() == DimensionType.T:
var = ncfile.addvar(dname, 'int', [dims[i]]) var = ncfile.addvar(dname, 'int', [dims[i]])
@ -664,7 +664,7 @@ def convert2nc(infn, outfn, version='netcdf3', writedimvar=False, largefile=Fals
#Add variables #Add variables
variables = [] variables = []
for var in f.variables(): for var in f.variables:
#print 'Variable: ' + var.name #print 'Variable: ' + var.name
if var.variable.hasNullDimension(): if var.variable.hasNullDimension():
continue continue
@ -682,7 +682,7 @@ def convert2nc(infn, outfn, version='netcdf3', writedimvar=False, largefile=Fals
#Write dimension variable data #Write dimension variable data
if writedimvar: if writedimvar:
for dimvar, dim in zip(dimvars, f.dimensions()): for dimvar, dim in zip(dimvars, f.dimensions):
if dim.getDimType() != DimensionType.T: if dim.getDimType() != DimensionType.T:
ncfile.write(dimvar, np.array(dim.getDimValue())) ncfile.write(dimvar, np.array(dim.getDimValue()))
@ -726,7 +726,7 @@ def grads2nc(infn, outfn, big_endian=None, largefile=False):
#Add dimensions #Add dimensions
dims = [] dims = []
for dim in f.dimensions(): for dim in f.dimensions:
dims.append(ncfile.adddim(dim.getShortName(), dim.getLength())) dims.append(ncfile.adddim(dim.getShortName(), dim.getLength()))
xdim = f.finddim('X') xdim = f.finddim('X')
ydim = f.finddim('Y') ydim = f.finddim('Y')
@ -742,7 +742,7 @@ def grads2nc(infn, outfn, big_endian=None, largefile=False):
#Add dimension variables #Add dimension variables
dimvars = [] dimvars = []
for dim, mdim in zip(dims, f.dimensions()): for dim, mdim in zip(dims, f.dimensions):
dname = dim.getShortName() dname = dim.getShortName()
if dname == 'T': if dname == 'T':
var = ncfile.addvar('time', 'int', [dim]) var = ncfile.addvar('time', 'int', [dim])
@ -766,7 +766,7 @@ def grads2nc(infn, outfn, big_endian=None, largefile=False):
#Add variables #Add variables
variables = [] variables = []
for var in f.variables(): for var in f.variables:
print('Variable: ' + var.name) print('Variable: ' + var.name)
vdims = [] vdims = []
for vdim in var.dims: for vdim in var.dims:
@ -784,7 +784,7 @@ def grads2nc(infn, outfn, big_endian=None, largefile=False):
ncfile.create() ncfile.create()
#Write variable data #Write variable data
for dimvar, dim in zip(dimvars, f.dimensions()): for dimvar, dim in zip(dimvars, f.dimensions):
if dim.getShortName() != 'T': if dim.getShortName() != 'T':
ncfile.write(dimvar, np.array(dim.getDimValue())) ncfile.write(dimvar, np.array(dim.getDimValue()))

16
meteoinfo-lab/pylib/mipylib/dataset/miio.py
View File

@ -38,7 +38,7 @@ def convert2nc(infn, outfn, version='netcdf3', writedimvar=False, largefile=Fals
#Add dimensions #Add dimensions
dims = [] dims = []
for dim in f.dimensions(): for dim in f.dimensions:
dims.append(ncfile.adddim(dim.getShortName(), dim.getLength())) dims.append(ncfile.adddim(dim.getShortName(), dim.getLength()))
#Add global attributes #Add global attributes
@ -49,8 +49,8 @@ def convert2nc(infn, outfn, version='netcdf3', writedimvar=False, largefile=Fals
tvar = None tvar = None
if writedimvar: if writedimvar:
dimvars = [] dimvars = []
for i in range(len(f.dimensions())): for i in range(len(f.dimensions)):
dim = f.dimensions()[i] dim = f.dimensions[i]
dname = dim.getShortName() dname = dim.getShortName()
if dim.getDimType() == DimensionType.T: if dim.getDimType() == DimensionType.T:
var = ncfile.addvar(dname, 'int', [dims[i]]) var = ncfile.addvar(dname, 'int', [dims[i]])
@ -79,7 +79,7 @@ def convert2nc(infn, outfn, version='netcdf3', writedimvar=False, largefile=Fals
#Add variables #Add variables
variables = [] variables = []
for var in f.variables(): for var in f.variables:
#print 'Variable: ' + var.getShortName() #print 'Variable: ' + var.getShortName()
if var.hasNullDimension(): if var.hasNullDimension():
continue continue
@ -107,7 +107,7 @@ def convert2nc(infn, outfn, version='netcdf3', writedimvar=False, largefile=Fals
#Write dimension variable data #Write dimension variable data
if writedimvar: if writedimvar:
for dimvar, dim in zip(dimvars, f.dimensions()): for dimvar, dim in zip(dimvars, f.dimensions):
if dim.getDimType() != DimensionType.T: if dim.getDimType() != DimensionType.T:
ncfile.write(dimvar, np.array(dim.getDimValue())) ncfile.write(dimvar, np.array(dim.getDimValue()))
@ -151,7 +151,7 @@ def grads2nc(infn, outfn, big_endian=None, largefile=False):
#Add dimensions #Add dimensions
dims = [] dims = []
for dim in f.dimensions(): for dim in f.dimensions:
dims.append(ncfile.adddim(dim.getShortName(), dim.getLength())) dims.append(ncfile.adddim(dim.getShortName(), dim.getLength()))
xdim = f.finddim('X') xdim = f.finddim('X')
ydim = f.finddim('Y') ydim = f.finddim('Y')
@ -189,7 +189,7 @@ def grads2nc(infn, outfn, big_endian=None, largefile=False):
#Add variables #Add variables
variables = [] variables = []
for var in f.variables(): for var in f.variables:
print 'Variable: ' + var.getShortName() print 'Variable: ' + var.getShortName()
vdims = [] vdims = []
for vdim in var.getDimensions(): for vdim in var.getDimensions():
@ -207,7 +207,7 @@ def grads2nc(infn, outfn, big_endian=None, largefile=False):
ncfile.create() ncfile.create()
#Write variable data #Write variable data
for dimvar, dim in zip(dimvars, f.dimensions()): for dimvar, dim in zip(dimvars, f.dimensions):
if dim.getShortName() != 'T': if dim.getShortName() != 'T':
ncfile.write(dimvar, np.array(dim.getDimValue())) ncfile.write(dimvar, np.array(dim.getDimValue()))