METK-161 added optional parameter to ParamID::normalise to request strict behavior

Author: danovaro

src/metkit/mars/ParamID.h

@@ -53,7 +53,7 @@ class ParamID {
 
     template <typename REQUEST_T, typename AXIS_T>
     static void normalise(const REQUEST_T& r, std::vector<Param>& req, const AXIS_T& axis, bool& windConversion,
-                          bool fullTableDropping = ParamID::fullTableDropping());
+                          bool fullTableDropping = ParamID::fullTableDropping(), bool useParamId = false);
 
     static const std::vector<WindFamily>& getWindFamilies();
     static const std::vector<size_t>& getDropTables();
@@ -69,14 +69,14 @@ inline long replaceTable(size_t table, long paramid) {
 
 template <typename REQUEST_T, typename AXIS_T>
 void ParamID::normalise(const REQUEST_T& request, std::vector<Param>& req, const AXIS_T& axis, bool& windConversion,
-                        bool fullTableDropping) {
+                        bool fullTableDropping, bool useParamId) {
 
     static const bool useGRIBParamID = eckit::Resource<bool>("useGRIBParamID", false);
 
     const std::vector<WindFamily>& windFamilies(getWindFamilies());
 
 
-    if (useGRIBParamID) {
+    if (useGRIBParamID || useParamId) {
 
 
         std::set<Param> inAxis;