Commits · 5e5de81f6c4c007dbe92d3675b25f5bca86f4e93

The MapProj class has been renamed in Coords. It now contains the coordinates (lat,long) and (xcoord, ycoord) and should therefore be used as a storage and conversion class. The necessary changes have been made to the rest of the code so it uses this class, but it still does NOT use it as a storage of coordinates (which will have to be done in the future). This addressed partially issue 35.

The doxygen comments for MapProj have been reorganized. An invalid type has been fixed in DEMObject and a structure updated in LegacyIO.ph.

Bugfix for A3DIO: Now it is no problem anymore if some stations exist in one Meteo2D file (e.g. wspd2005.txt) but not in another (e.g. wspd2006.txt). Unfortunately BufferedIOHandler will try to rebuffer the missing data and fail, which might be time consuming.

New methods have been added/updated in the Arrays (1D, 2D, 3D): getMin, getMax and getMean. They accept an optional argument (either RAW_NODATA or PARSE_NODATA) that tells how to interpret nodata values (as normal values or really as nodata).

The dem usage example code has been improved in order to show more capabilities.

A few static members have been added to MapProj to handle latitude/longitude: a method for converting a decimal latitude or longitude to degrees, minutes, seconds (formatted as d°m's"),  a method for converting a string containing degrees, minutes, seconds to decimal latitude or longitude and a method for parsing a position expressed as latitude/longitude (given in a string) and returning decimal latitude and longitude. This is the implementation of issue 34.

In the MapProj class, a new conversion has been added: UTM to/from WGS84. Simply give "UTM" as the coordinate system and specify in the optional arguments the zone number (for example, 31T).

A (tricky) error has been fixed in the VincentyDistance. The bearing that was chosen was the average between the initial and reverse bearing. That seemd a good idea at the time, but this made reprojecting a local grid computed using Vincenty impossible: the required bearing (starting from the reference point) is the initial bearing, the average one was sending us hundreds of kilometers away from the correct coordinate (when doing (lat,lon) -> local -> (lat,lon)). 

Finally, a few more powN() methods have been added to IOUtils for convenience (yes, the projection business loves these!!)

The Special_PTS and CSpecialPointsArray structures have been renamed in "POINT" and "POINTSArray" (there was no reason to call them "special points"). 

A few new methods have been added to DEMObject: getPointsBetween that returns a vector containing the indices of all points located on the line between two points (given by their real world (x,y) coordinates), horizontalDistance that returns the horizontal distance between two points and terrainDistance that returns the distance between two point accros the terrain as described by the DEM (ie: going up and down the terrain).

A bug was preventing RH interpolations from working (the TA grid was initialized to size 0, and therefore the safety checks were later on stopping the interpolation of RH because the TA grid was of the wrong size). 

A "sanitize" method has been added to DEMObject so that all points that have an elevation but no slope/azimuth/normals/curvature see their elevation set to nodata (so that testing the elevation of a point is enough to guarantee that all information is available). The caller has therefore to decide if he prefers potentially losing a few points to guarantee a more consistent DEM or not...

The parallelization was lagging behind, so this has been fixed: One internal variable was not serialized in DEMObject, there was no serialization at all in Meteo2DInterpolator and some marshalling methods had to be written (in marshall_meteoio). The serialization of Meteo2DInterpolator should be tested however!

The marshalling code has been cleaned up and some missing "std::" added in FilterAlgorithms (doxygen was complaining).

A new method "setDefaultAlgorithm" has been added to the DEMObject so that the caller can specify which slope computation algorithm to use. The default algorithm argument has also been added to the constructors (as optional argument). This means that each constructor MUST call setDefaultAlgorithm.

A new slope computation algorithm has been added: FLEM for (Fleming and Hoffer, 1979). This algorithm is faster, simpler and usually better then the other ones (according to (Hodgson, >1997)).

Finally, some benchmarks have been done comparing the current slope computation speed with the old implementation (which could not handle holes in DEM): the current method is only 5% slower and it can now handle holes!

The DEMObject has been modified so that it can now correctly handle grids with nodata values when computing slope/azimuth/curvature (this is in effect the fix for issue 15). This is "best effort" approach: several strategies are applied if some points are missing in order to still be able to compute as much as possible the parameters for their neighbours (if the latter contain an elevation!). The resulting grids are consistent for slopes (ie: if the slope can be computed, then the azimuth too and the normals too) and the curvature is handled separately (ie: it is possible to find points where ONLY the curvature is nodata).

Several inappropriate behaviors have been fixed for cells next to a nodata point (or next to an edge). This should have fixed issue 7.

The necessary check have been added to libinterpol2D:SimpleDEMWindInterpolate

Added the MeanAvgFilter and updated the MedianAvgFilter. Now the position of the filter window can be defined. The keyword soft has the meaning that the configuration of the window position is not strict (it will adapt if there is not enough data available for the user defined window position). If both soft and the position for the window (left, right, center) are missing "center" is assumed. Usage:

TA::filter1 = mean_avg
TA::arg1   = soft right 10 100
RH::filter1 = median_avg
RH::arg1  = 10 200

Meaning: use mean_avg filter on TA, the window shall be right leaning spanning at least 10 points and 100 minutes. Use median_avg filter on RH, the window shall be centered (strictly).

Oups... My previous commit was wrong, this is the commit that fixes the compilation bugs in libinterpol2D.

A mistake has been found in BoschungIO: the key for precipitation was wrong (we were reading the precipitation type as a precipitation amount, which was quite bad for the simulation!).

A few missing cases of nodata have been identified (thanks Cyril!) and fixed in libinterpol2D

dynamic use of meteoio (ie. dynamically loaded from an application -- for exemple from Java application with the JNI mechanism).
This leads to save the dem file loading time in further interpolation (more than half the time is saved in some cases).

* Tries to make the "dynamic" interpolation call thread-safe in a multithreaded context (ie. concurrent interpolation are called by 
different threads) : 
	-> identifies the Critical Section and the critical resources
	-> use of a 'synchronized' java-like macro to isolate these sections and resources

void interpolate(const MeteoData::Parameters& meteoparam, Grid2DObject& result);

The new Meteo2DInterpolator class parses the ConfigReader object passed to it and stores all possible algorithms for each MeteoData variable (user configured). In the next step the user configured algorithms shall be invoked and a quality estimator chooses the most appropiate of the algorithms to interpolate the 2D grid for a given meteo parameter.

Adjustments needed to be made to the ConfigReader class (function findKeys) and a few comments have been added to MeteoFilter for more clarity of the ConfgReader parsing process.

Add JNI and JNA compatible interfaces to dynamically call
meteoio from JAVA.
At the moment only two simple functions are exposed with some restrictions (only one interpolation by call, not all IO plugin supported [ARCIO, Geotop, GrassIO] ).

The successfull call of MeteoIO from Java has been implemented by Cyril Perot but needed a few adjustments in MeteoIO. This commit makes the said adjustments: a few more "#ifdef _POPC_", a missing ConfgReader.addKey(key, section, value) and some previously private members of Meteo2DInterpolator now exposed. 

The plugin unloading sections have been protected by ifndef _METEOIO_JNI because the current implementation of such Java integration uses JNI and does its own plugin loading/unloading.

In an effort to make ConfigReader more flexible, its interface has been expanded: it is now possible to read several files into one ConfigReader, or to manually add key/value pairs and it is planned that a string containing command line arguments could be given to populate the internal map of ConfigReader.

This is the begining of a plugins developer's guide... (within the doxygen documentation). A few things would need to be filled by Thomas!

Fixed issue 26: when compiling on anything other than ix386, compiling statically linked code into a dynamic library is NOT valid (ie: one can not mix PDC and PIC code). So everything is now compiled with -fPIC (which comes from the fact that our plugins are dynamic libraries).

The examples have been improved: some misakes have been fixed, a Makefile has been added as well as an example io.ini and some input files (dem, meteo data). This means that the example code can be built and run!

A new slope computation algorithm has bee added: CARD It computes the slope using Corripio and then discretizes the azimuth along 8 cardinal directions and the slope by degrees. This should be all that GEOtop needs for its drainage direction (then simply calling a dem.update("CARDINAL")).

The copyright notices have been put in place in all files (headers and cc) with proper attribution of copyright.

The documentation has been improved, specially fixing issue 22. Warning messages of doxygen have been fixed. An example subdirectory has been created in /doc and contains (currently) 2 examples of code using MeteoIO.

The license information has been added: LPGLv3 headers in all header files, license texts as well as a Linux Software Map entry file.

The installation procedure has been added to cmake configuration files (similar to the autotools)

Corrected error in the filter called "rate", the accumulation filter - the accumulation loop counted the last element twice.

GeotopIO had to be adapted to a new range of parameters that come with the new version of GEOtop.

Some unnecessarily duplicated code has been removed in IOHandler.cc. The warnings "warning: base class ‘class paroc_base’ should be explicitly initialized in the copy constructor" have been fixed for Date_IO and MeteoData. 

The IOHandler popc behavior has been changed: it now forces the creation of the IOHander object on the local host.

The Makefile has been slightly improved (end of compilation message)

A few fixes for Popc from Laurent Winkler... fixed some code that was segfaulting with popc, made MeteoIO objects remain on localhost instead of being moved to another node.

This version has been (a little bit) tested with popc. The code that needed validation (MeteoData information necessary for filtering) seems to work, so some code tagging has been removed and some commented out methods deleted.

Fixed the install bug that was preventing the installation if the parallel version was not compiled. Following the latest evolution of Pop-C++, an inheritance for the popc exceptions had to be removed. 

usage (in io.ini):
[Filters]
TA::filter1 = median_avg
TA::arg1    = 20 100

The first argument specifies the minimal number of points, the second argument the minimal duration that the window for the filter has to have: if these conditions cannot be met (too little data) the filter is not executed.

CMake changes: possibility of including/linking proj4, creating shared and static version of libmeteoio, install script for installing all the plugins to /usr/local and a change to IOHandler.cc: if no PLUGINPATH is specified in the io.ini file all paths defined for ldconfig and LD_LIBRARY_PATH are searched for the plugins.

Furthermore a versioning system for the plugins and meteoio has been introduced.