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

update NetCDF to version 5.5.2

Browse Source
This commit is contained in:
wyq 2022-02-16 11:34:01 +08:00
parent 148ed8be89
commit 82ff6d08a0
9 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.idea/libraries/Maven__edu_ucar_netcdfAll_5_4_1.xml generated
View File

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: edu.ucar:netcdfAll:5.4.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/edu/ucar/netcdfAll/5.4.1/netcdfAll-5.4.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/edu/ucar/netcdfAll/5.4.1/netcdfAll-5.4.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/edu/ucar/netcdfAll/5.4.1/netcdfAll-5.4.1-sources.jar!/" />
</SOURCES>
</library>
</component>

2
meteoinfo-chart/meteoinfo-chart.iml
View File

@ -72,7 +72,7 @@
<orderEntry type="library" name="Maven: org.locationtech.proj4j:proj4j:1.1.4" level="project" /> <orderEntry type="library" name="Maven: org.locationtech.proj4j:proj4j:1.1.4" level="project" />
<orderEntry type="library" name="Maven: net.sf.geographiclib:GeographicLib-Java:1.52" level="project" /> <orderEntry type="library" name="Maven: net.sf.geographiclib:GeographicLib-Java:1.52" level="project" />
<orderEntry type="module" module-name="meteoinfo-dataframe" /> <orderEntry type="module" module-name="meteoinfo-dataframe" />
<orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.4.1" level="project" /> <orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.5.2" level="project" />
<orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" /> <orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
<orderEntry type="library" name="Maven: com.formdev:flatlaf:2.0.1" level="project" /> <orderEntry type="library" name="Maven: com.formdev:flatlaf:2.0.1" level="project" />

2
meteoinfo-data/meteoinfo-data.iml
View File

@ -31,7 +31,7 @@
<orderEntry type="library" name="Maven: org.locationtech.proj4j:proj4j:1.1.4" level="project" /> <orderEntry type="library" name="Maven: org.locationtech.proj4j:proj4j:1.1.4" level="project" />
<orderEntry type="library" name="Maven: net.sf.geographiclib:GeographicLib-Java:1.52" level="project" /> <orderEntry type="library" name="Maven: net.sf.geographiclib:GeographicLib-Java:1.52" level="project" />
<orderEntry type="module" module-name="meteoinfo-dataframe" /> <orderEntry type="module" module-name="meteoinfo-dataframe" />
<orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.4.1" level="project" /> <orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.5.2" level="project" />
<orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" /> <orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
</component> </component>

2
meteoinfo-data/pom.xml
View File

@ -43,7 +43,7 @@
<dependency> <dependency>
<groupId>edu.ucar</groupId> <groupId>edu.ucar</groupId>
<artifactId>netcdfAll</artifactId> <artifactId>netcdfAll</artifactId>
<version>5.4.1</version> <version>5.5.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.albfernandez</groupId> <groupId>com.github.albfernandez</groupId>

2
meteoinfo-geo/meteoinfo-geo.iml
View File

@ -80,7 +80,7 @@
<orderEntry type="library" name="Maven: org.locationtech.proj4j:proj4j:1.1.4" level="project" /> <orderEntry type="library" name="Maven: org.locationtech.proj4j:proj4j:1.1.4" level="project" />
<orderEntry type="library" name="Maven: net.sf.geographiclib:GeographicLib-Java:1.52" level="project" /> <orderEntry type="library" name="Maven: net.sf.geographiclib:GeographicLib-Java:1.52" level="project" />
<orderEntry type="module" module-name="meteoinfo-dataframe" /> <orderEntry type="module" module-name="meteoinfo-dataframe" />
<orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.4.1" level="project" /> <orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.5.2" level="project" />
<orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" /> <orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
<orderEntry type="library" name="Maven: org.meteothink:wContour:1.7.1" level="project" /> <orderEntry type="library" name="Maven: org.meteothink:wContour:1.7.1" level="project" />

16
meteoinfo-geo/src/main/java/org/meteoinfo/geo/meteodata/DrawMeteoData.java
View File

@ -686,10 +686,14 @@ public class DrawMeteoData {
int[][] S1 = new int[gridData.getYNum()][gridData.getXNum()]; int[][] S1 = new int[gridData.getYNum()][gridData.getXNum()];
double[] xArray = gridData.getXArray(); double[] xArray = gridData.getXArray();
double[] yArray = gridData.getYArray(); double[] yArray = gridData.getYArray();
if (gridData.getXDelta() < 0) if (gridData.getXDelta() < 0) {
ArrayUtils.reverse(xArray); ArrayUtils.reverse(xArray);
if (gridData.getYDelta() < 0) gridData.xReverse();
}
if (gridData.getYDelta() < 0) {
ArrayUtils.reverse(yArray); ArrayUtils.reverse(yArray);
gridData.yReverse();
}
Object[] cbs = ContourDraw.tracingContourLines(gridData.getData(), Object[] cbs = ContourDraw.tracingContourLines(gridData.getData(),
cValues, xArray, yArray, gridData.getDoubleMissingValue(), S1); cValues, xArray, yArray, gridData.getDoubleMissingValue(), S1);
List<PolyLine> ContourLines = (List<PolyLine>) cbs[0]; List<PolyLine> ContourLines = (List<PolyLine>) cbs[0];
@ -911,10 +915,14 @@ public class DrawMeteoData {
int[][] S1 = new int[gridData.getYNum()][gridData.getXNum()]; int[][] S1 = new int[gridData.getYNum()][gridData.getXNum()];
double[] xArray = gridData.getXArray(); double[] xArray = gridData.getXArray();
double[] yArray = gridData.getYArray(); double[] yArray = gridData.getYArray();
if (gridData.getXDelta() < 0) if (gridData.getXDelta() < 0) {
ArrayUtils.reverse(xArray); ArrayUtils.reverse(xArray);
if (gridData.getYDelta() < 0) gridData.xReverse();
}
if (gridData.getYDelta() < 0) {
ArrayUtils.reverse(yArray); ArrayUtils.reverse(yArray);
gridData.yReverse();
}
Object[] cbs = ContourDraw.tracingContourLines(gridData.getData(), Object[] cbs = ContourDraw.tracingContourLines(gridData.getData(),
cValues, xArray, yArray, gridData.getDoubleMissingValue(), S1); cValues, xArray, yArray, gridData.getDoubleMissingValue(), S1);
ContourLines = (List<PolyLine>) cbs[0]; ContourLines = (List<PolyLine>) cbs[0];

2
meteoinfo-lab/meteoinfo-lab.iml
View File

@ -81,7 +81,7 @@
<orderEntry type="library" name="Maven: org.locationtech.proj4j:proj4j:1.1.4" level="project" /> <orderEntry type="library" name="Maven: org.locationtech.proj4j:proj4j:1.1.4" level="project" />
<orderEntry type="library" name="Maven: net.sf.geographiclib:GeographicLib-Java:1.52" level="project" /> <orderEntry type="library" name="Maven: net.sf.geographiclib:GeographicLib-Java:1.52" level="project" />
<orderEntry type="module" module-name="meteoinfo-dataframe" /> <orderEntry type="module" module-name="meteoinfo-dataframe" />
<orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.4.1" level="project" /> <orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.5.2" level="project" />
<orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" /> <orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
<orderEntry type="library" name="Maven: com.formdev:flatlaf:2.0.1" level="project" /> <orderEntry type="library" name="Maven: com.formdev:flatlaf:2.0.1" level="project" />

14
meteoinfo-lab/milconfig.xml
View File

@ -1,8 +1,6 @@
<?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\plot_types\3d\jogl\surf"> <Path OpenPath="D:\Working\MIScript\Jython\mis\io\grib">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\isosurface"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\particles"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\streamslice"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\streamslice"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d"/>
@ -13,20 +11,22 @@
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo\calc"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo\calc"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo\interpolation"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo\interpolation"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\micaps"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\micaps"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf"/> <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\grib"/>
</Path> </Path>
<File> <File>
<OpenedFiles> <OpenedFiles>
<OpenedFile File="D:\Working\MIScript\Jython\mis\meteo\calc\potential_vorticity_baroclinic.py"/> <OpenedFile File="D:\Working\MIScript\Jython\mis\meteo\calc\potential_vorticity_baroclinic.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\meteo\calc\isentropic_analysis.py"/> <OpenedFile File="D:\Working\MIScript\Jython\mis\meteo\calc\isentropic_analysis.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf\surf_sombrero.py"/> <OpenedFile File="D:\Working\MIScript\Jython\mis\io\grib\grib_ensemble.py"/>
</OpenedFiles> </OpenedFiles>
<RecentFiles> <RecentFiles>
<RecentFile File="D:\Working\MIScript\Jython\mis\meteo\calc\potential_vorticity_baroclinic.py"/> <RecentFile File="D:\Working\MIScript\Jython\mis\meteo\calc\potential_vorticity_baroclinic.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\meteo\calc\isentropic_analysis.py"/> <RecentFile File="D:\Working\MIScript\Jython\mis\meteo\calc\isentropic_analysis.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf\surf_sombrero.py"/> <RecentFile File="D:\Working\MIScript\Jython\mis\io\grib\grib_ensemble.py"/>
</RecentFiles> </RecentFiles>
</File> </File>
<Font> <Font>
@ -34,5 +34,5 @@
</Font> </Font>
<LookFeel DockWindowDecorated="true" LafDecorated="true" Name="FlatDarkLaf"/> <LookFeel DockWindowDecorated="true" LafDecorated="true" Name="FlatDarkLaf"/>
<Figure DoubleBuffering="true"/> <Figure DoubleBuffering="true"/>
<Startup MainFormLocation="-7,0" MainFormSize="1386,809"/> <Startup MainFormLocation="-7,0" MainFormSize="1368,791"/>
</MeteoInfo> </MeteoInfo>

2
meteoinfo-map/meteoinfo-map.iml
View File

@ -72,7 +72,7 @@
<orderEntry type="library" name="Maven: org.locationtech.proj4j:proj4j:1.1.4" level="project" /> <orderEntry type="library" name="Maven: org.locationtech.proj4j:proj4j:1.1.4" level="project" />
<orderEntry type="library" name="Maven: net.sf.geographiclib:GeographicLib-Java:1.52" level="project" /> <orderEntry type="library" name="Maven: net.sf.geographiclib:GeographicLib-Java:1.52" level="project" />
<orderEntry type="module" module-name="meteoinfo-dataframe" /> <orderEntry type="module" module-name="meteoinfo-dataframe" />
<orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.4.1" level="project" /> <orderEntry type="library" name="Maven: edu.ucar:netcdfAll:5.5.2" level="project" />
<orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" /> <orderEntry type="library" name="Maven: com.github.albfernandez:juniversalchardet:2.4.0" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
<orderEntry type="library" name="Maven: com.formdev:flatlaf:2.0.1" level="project" /> <orderEntry type="library" name="Maven: com.formdev:flatlaf:2.0.1" level="project" />