"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/CDMMergeUtils.h" between
fimex-1.6.4.tar.gz and fimex-1.6.5.tar.gz

About: Fimex is a the File Interpolation, Manipulation and EXtraction library for gridded geospatial data. It converts between different, extensible dataformats (currently netcdf, NcML, grib1/2 and felt).

CDMMergeUtils.h  (fimex-1.6.4):CDMMergeUtils.h  (fimex-1.6.5)
/* /*
Fimex, src/CDMMergeUtils.h Fimex, src/CDMMergeUtils.h
Copyright (C) 2019 met.no Copyright (C) 2019-2021 met.no
Contact information: Contact information:
Norwegian Meteorological Institute Norwegian Meteorological Institute
Box 43 Blindern Box 43 Blindern
0313 OSLO 0313 OSLO
NORWAY NORWAY
email: diana@met.no email: diana@met.no
Project Info: https://wiki.met.no/fimex/start Project Info: https://wiki.met.no/fimex/start
skipping to change at line 36 skipping to change at line 36
License along with this library; if not, write to the Free Software License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA. USA.
*/ */
#ifndef fimex_CDMMergeUtils_h #ifndef fimex_CDMMergeUtils_h
#define fimex_CDMMergeUtils_h #define fimex_CDMMergeUtils_h
#include "fimex/CDMBorderSmoothing.h" #include "fimex/CDMBorderSmoothing.h"
#include "fimex/CDMReaderDecl.h" #include "fimex/CDMReaderDecl.h"
#include "fimex/DataDecl.h" #include "fimex/Data.h"
#include "fimex/SharedArray.h"
#include "fimex/coordSys/CoordSysDecl.h" #include "fimex/coordSys/CoordSysDecl.h"
#include <memory> #include <memory>
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
#include <set> #include <set>
#include <sstream> #include <sstream>
#include <vector> #include <vector>
skipping to change at line 86 skipping to change at line 87
bool is_compatible(CDMReader_p readerB, CDMReader_p readerT, const CoordinateSys tem_cp_v& allCsB, const CoordinateSystem_cp_v& allCsT, bool is_compatible(CDMReader_p readerB, CDMReader_p readerT, const CoordinateSys tem_cp_v& allCsB, const CoordinateSystem_cp_v& allCsT,
const std::string& varName); const std::string& varName);
values_v getAxisValues(const CDMReader_p reader, CoordinateAxis_cp axis, const s td::string& unit); values_v getAxisValues(const CDMReader_p reader, CoordinateAxis_cp axis, const s td::string& unit);
CDM makeMergedCDM(CDMReader_p readerI, CDMReader_p& readerO, int gridInterpolati onMethod, CDMInterpolator_p& interpolatedO, std::string& nameX, CDM makeMergedCDM(CDMReader_p readerI, CDMReader_p& readerO, int gridInterpolati onMethod, CDMInterpolator_p& interpolatedO, std::string& nameX,
std::string& nameY, bool keepAllOuter = false); std::string& nameY, bool keepAllOuter = false);
CDMBorderSmoothing::SmoothingFactory_p createSmoothingFactory(const std::string& specification); CDMBorderSmoothing::SmoothingFactory_p createSmoothingFactory(const std::string& specification);
template <class T>
shared_array<T> dataAs(DataPtr data);
template <>
inline shared_array<float> dataAs<float>(DataPtr data) { return data->asFloat();
}
template <>
inline shared_array<double> dataAs<double>(DataPtr data) { return data->asDouble
(); }
} // namespace MetNoFimex } // namespace MetNoFimex
#endif // fimex_CDMMergeUtils_h #endif // fimex_CDMMergeUtils_h
 End of changes. 3 change blocks. 
2 lines changed or deleted 14 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)