diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml new file mode 100644 index 00000000..947a8fa8 --- /dev/null +++ b/.idea/checkstyle-idea.xml @@ -0,0 +1,16 @@ + + + + 10.12.0 + JavaOnly + true + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index e8e76180..7aedd592 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -11,6 +11,7 @@ + @@ -19,8 +20,8 @@ - + diff --git a/.idea/encodings.xml b/.idea/encodings.xml index dfda9f85..435d2a17 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -21,8 +21,12 @@ + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index b93f539e..52c0635f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,8 +8,13 @@ + - + \ No newline at end of file diff --git a/MeteoInfo.iml b/MeteoInfo.iml new file mode 100644 index 00000000..9e3449c9 --- /dev/null +++ b/MeteoInfo.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/meteoinfo-chart/meteoinfo-chart.iml b/meteoinfo-chart/meteoinfo-chart.iml new file mode 100644 index 00000000..9e3449c9 --- /dev/null +++ b/meteoinfo-chart/meteoinfo-chart.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/meteoinfo-common/meteoinfo-common.iml b/meteoinfo-common/meteoinfo-common.iml new file mode 100644 index 00000000..9e3449c9 --- /dev/null +++ b/meteoinfo-common/meteoinfo-common.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/meteoinfo-console/meteoinfo-console.iml b/meteoinfo-console/meteoinfo-console.iml new file mode 100644 index 00000000..9e3449c9 --- /dev/null +++ b/meteoinfo-console/meteoinfo-console.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/meteoinfo-data/meteoinfo-data.iml b/meteoinfo-data/meteoinfo-data.iml new file mode 100644 index 00000000..9e3449c9 --- /dev/null +++ b/meteoinfo-data/meteoinfo-data.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/meteoinfo-dataframe/meteoinfo-dataframe.iml b/meteoinfo-dataframe/meteoinfo-dataframe.iml new file mode 100644 index 00000000..9e3449c9 --- /dev/null +++ b/meteoinfo-dataframe/meteoinfo-dataframe.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/meteoinfo-geo/meteoinfo-geo.iml b/meteoinfo-geo/meteoinfo-geo.iml new file mode 100644 index 00000000..9e3449c9 --- /dev/null +++ b/meteoinfo-geo/meteoinfo-geo.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/meteoinfo-geometry/meteoinfo-geometry.iml b/meteoinfo-geometry/meteoinfo-geometry.iml new file mode 100644 index 00000000..9e3449c9 --- /dev/null +++ b/meteoinfo-geometry/meteoinfo-geometry.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/meteoinfo-image/meteoinfo-image.iml b/meteoinfo-image/meteoinfo-image.iml new file mode 100644 index 00000000..9e3449c9 --- /dev/null +++ b/meteoinfo-image/meteoinfo-image.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/meteoinfo-lab/meteoinfo-lab.iml b/meteoinfo-lab/meteoinfo-lab.iml new file mode 100644 index 00000000..9e3449c9 --- /dev/null +++ b/meteoinfo-lab/meteoinfo-lab.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/meteoinfo-lab/milconfig.xml b/meteoinfo-lab/milconfig.xml index a94b7875..7a54493c 100644 --- a/meteoinfo-lab/milconfig.xml +++ b/meteoinfo-lab/milconfig.xml @@ -1,34 +1,36 @@ - - - - + - - + + + + + - + + - + + @@ -36,5 +38,5 @@
- + diff --git a/meteoinfo-lab/pylib/mipylib/__init__$py.class b/meteoinfo-lab/pylib/mipylib/__init__$py.class index eb77a154..f7d80052 100644 Binary files a/meteoinfo-lab/pylib/mipylib/__init__$py.class and b/meteoinfo-lab/pylib/mipylib/__init__$py.class differ diff --git a/meteoinfo-lab/pylib/mipylib/__init__.py b/meteoinfo-lab/pylib/mipylib/__init__.py index 2dd22b83..ede1a117 100644 --- a/meteoinfo-lab/pylib/mipylib/__init__.py +++ b/meteoinfo-lab/pylib/mipylib/__init__.py @@ -12,12 +12,13 @@ import imagelib from dataframe import * import enum -print('MeteoInfoLab 3.6.3') - import os mi_dir = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) migl.mifolder = mi_dir +__version__ = '3.6.3' +pstr = 'MeteoInfoLab {}'.format(__version__) + lookup_cma = os.path.join(mi_dir, 'tables', 'bufr', 'tablelookup_cma.csv') if os.path.isfile(lookup_cma): try: @@ -25,4 +26,6 @@ if os.path.isfile(lookup_cma): except: is_ok = False if is_ok: - print('CMA Bufr lookup file added.') \ No newline at end of file + pstr += ' (CMA Bufr lookup file added)' + +print(pstr) \ No newline at end of file diff --git a/meteoinfo-map/meteoinfo-map.iml b/meteoinfo-map/meteoinfo-map.iml new file mode 100644 index 00000000..9e3449c9 --- /dev/null +++ b/meteoinfo-map/meteoinfo-map.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/meteoinfo-math/meteoinfo-math.iml b/meteoinfo-math/meteoinfo-math.iml new file mode 100644 index 00000000..9e3449c9 --- /dev/null +++ b/meteoinfo-math/meteoinfo-math.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/meteoinfo-math/pom.xml b/meteoinfo-math/pom.xml index 4ba9e124..86624e23 100644 --- a/meteoinfo-math/pom.xml +++ b/meteoinfo-math/pom.xml @@ -53,16 +53,6 @@ openblas-platform 0.3.10-1.5.4 - - org.bytedeco - mkl-platform - 2020.3-1.5.4 - - - org.bytedeco - mkl-platform-redist - 2020.3-1.5.4 - org.junit.jupiter junit-jupiter diff --git a/meteoinfo-mkl/pom.xml b/meteoinfo-mkl/pom.xml new file mode 100644 index 00000000..249f4770 --- /dev/null +++ b/meteoinfo-mkl/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + org.meteothink + MeteoInfo + 3.7.0-SNAPSHOT + + + meteoinfo-mkl + + + 1.8 + 1.8 + + + + + ${project.groupId} + meteoinfo-math + ${project.version} + + + org.bytedeco + javacpp-platform + 1.5.4 + + + org.bytedeco + mkl-platform + 2020.3-1.5.4 + + + org.bytedeco + mkl-platform-redist + 2020.3-1.5.4 + + + + + + + true + org.apache.maven.plugins + maven-javadoc-plugin + 3.3.1 + + + attach-javadocs + + jar + + + false + false + + + + + + + + \ No newline at end of file diff --git a/meteoinfo-math/src/main/java/org/meteoinfo/math/blas/mkl/MKL.java b/meteoinfo-mkl/src/main/java/org/meteoinfo/math/blas/mkl/MKL.java similarity index 99% rename from meteoinfo-math/src/main/java/org/meteoinfo/math/blas/mkl/MKL.java rename to meteoinfo-mkl/src/main/java/org/meteoinfo/math/blas/mkl/MKL.java index e3306c66..c26f5a26 100644 --- a/meteoinfo-math/src/main/java/org/meteoinfo/math/blas/mkl/MKL.java +++ b/meteoinfo-mkl/src/main/java/org/meteoinfo/math/blas/mkl/MKL.java @@ -17,10 +17,12 @@ package org.meteoinfo.math.blas.mkl; +import org.meteoinfo.math.blas.*; + import java.nio.DoubleBuffer; import java.nio.FloatBuffer; import java.nio.IntBuffer; -import org.meteoinfo.math.blas.*; + import static org.bytedeco.mkl.global.mkl_rt.*; import static org.bytedeco.openblas.global.openblas.LAPACKE_dorgqr; import static org.bytedeco.openblas.global.openblas.LAPACKE_dorgrq; diff --git a/meteoinfo-ndarray/meteoinfo-ndarray.iml b/meteoinfo-ndarray/meteoinfo-ndarray.iml new file mode 100644 index 00000000..9e3449c9 --- /dev/null +++ b/meteoinfo-ndarray/meteoinfo-ndarray.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/meteoinfo-projection/meteoinfo-projection.iml b/meteoinfo-projection/meteoinfo-projection.iml new file mode 100644 index 00000000..9e3449c9 --- /dev/null +++ b/meteoinfo-projection/meteoinfo-projection.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/meteoinfo-table/meteoinfo-table.iml b/meteoinfo-table/meteoinfo-table.iml new file mode 100644 index 00000000..9e3449c9 --- /dev/null +++ b/meteoinfo-table/meteoinfo-table.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/meteoinfo-ui/meteoinfo-ui.iml b/meteoinfo-ui/meteoinfo-ui.iml new file mode 100644 index 00000000..9e3449c9 --- /dev/null +++ b/meteoinfo-ui/meteoinfo-ui.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 311b6283..83c6dea3 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,7 @@ meteoinfo-dataframe meteoinfo-data meteoinfo-projection + meteoinfo-mkl