Reverting grib_wind_large_position and

src/attributes/GribDecoderAttributes.cc

@@ -44,9 +44,6 @@ GribDecoderAttributes::GribDecoderAttributes():
 	position_1_(ParameterManager::getInt("grib_wind_position_1")),
 	position_2_(ParameterManager::getInt("grib_wind_position_2")),
 	colour_position_(ParameterManager::getInt("grib_wind_position_colour")),
-	large_position_1_(ParameterManager::getULong("grib_wind_large_position_1")),
-	large_position_2_(ParameterManager::getULong("grib_wind_large_position_2")),
-	large_colour_position_(ParameterManager::getULong("grib_wind_large_position_colour")),
 	missing_value_(ParameterManager::getDouble("grib_missing_value_indicator")),
 	wind_style_(ParameterManager::getBool("grib_wind_style"))
 	,
@@ -89,9 +86,6 @@ void GribDecoderAttributes::set(const std::map<string, string>& params)
 	setAttribute(prefix, "grib_wind_position_1", position_1_, params);
 	setAttribute(prefix, "grib_wind_position_2", position_2_, params);
 	setAttribute(prefix, "grib_wind_position_colour", colour_position_, params);
-	setAttribute(prefix, "grib_wind_large_position_1", large_position_1_, params);
-	setAttribute(prefix, "grib_wind_large_position_2", large_position_2_, params);
-	setAttribute(prefix, "grib_wind_large_position_colour", large_colour_position_, params);
 	setAttribute(prefix, "grib_missing_value_indicator", missing_value_, params);
 	setAttribute(prefix, "grib_wind_style", wind_style_, params);
 
@@ -121,9 +115,6 @@ void GribDecoderAttributes::copy(const GribDecoderAttributes& other)
 	position_1_ = other.position_1_;
 	position_2_ = other.position_2_;
 	colour_position_ = other.colour_position_;
-	large_position_1_ = other.large_position_1_;
-	large_position_2_ = other.large_position_2_;
-	large_colour_position_ = other.large_colour_position_;
 	missing_value_ = other.missing_value_;
 	wind_style_ = other.wind_style_;
 	address_mode_ = unique_ptr<GribAddressMode>(other.address_mode_->clone());
@@ -193,9 +184,6 @@ void GribDecoderAttributes::print(ostream& out)  const
 	out << " position_1 = " <<  position_1_;
 	out << " position_2 = " <<  position_2_;
 	out << " colour_position = " <<  colour_position_;
-	out << " large_position_1 = " <<  large_position_1_;
-	out << " large_position_2 = " <<  large_position_2_;
-	out << " large_colour_position = " <<  large_colour_position_;
 	out << " missing_value = " <<  missing_value_;
 	out << " wind_style = " <<  wind_style_;
 	out << " address_mode = " <<  *address_mode_;
@@ -245,12 +233,6 @@ void GribDecoderAttributes::toxml(ostream& out)  const
 	niceprint(out,position_2_);
 	out << ", \"grib_wind_position_colour\":";
 	niceprint(out,colour_position_);
-	out << ", \"grib_wind_large_position_1\":";
-	niceprint(out,large_position_1_);
-	out << ", \"grib_wind_large_position_2\":";
-	niceprint(out,large_position_2_);
-	out << ", \"grib_wind_large_position_colour\":";
-	niceprint(out,large_colour_position_);
 	out << ", \"grib_missing_value_indicator\":";
 	niceprint(out,missing_value_);
 	out << ", \"grib_wind_style\":";
@@ -281,9 +263,6 @@ static MagicsParameter<int> grib_field_position("grib_field_position", 1);
 static MagicsParameter<int> grib_wind_position_1("grib_wind_position_1", 1);
 static MagicsParameter<int> grib_wind_position_2("grib_wind_position_2", -1);
 static MagicsParameter<int> grib_wind_position_colour("grib_wind_position_colour", -1);
-static MagicsParameter<unsigned long long> grib_wind_large_position_1("grib_wind_large_position_1", 0);
-static MagicsParameter<unsigned long long> grib_wind_large_position_2("grib_wind_large_position_2", 0);
-static MagicsParameter<unsigned long long> grib_wind_large_position_colour("grib_wind_large_position_colour", 0);
 static MagicsParameter<double> grib_missing_value_indicator("grib_missing_value_indicator", -1.5e+21);
 static MagicsParameter<string> grib_wind_style("grib_wind_style", "off");
 static MagicsParameter<string> grib_file_address_mode("grib_file_address_mode", "record");

src/attributes/GribDecoderAttributes.h

@@ -71,9 +71,6 @@ class GribDecoderAttributes
 	int position_1_;
 	int position_2_;
 	int colour_position_;
-	unsigned long long large_position_1_;
-	unsigned long long large_position_2_;
-	unsigned long long large_colour_position_;
 	double missing_value_;
 	bool wind_style_;
 	unique_ptr<GribAddressMode> address_mode_;

src/attributes/GribDecoderWrapper.cc

@@ -141,18 +141,6 @@ void GribDecoderWrapper::set(const MagRequest& request)
 		int colour_position_value = request("GRIB_WIND_POSITION_COLOUR");
 		gribdecoder_->colour_position_ = colour_position_value;
 		}
-	if  (request.countValues("GRIB_WIND_LARGE_POSITION_1") ) {
-		unsigned long long large_position_1_value = request("GRIB_WIND_LARGE_POSITION_1");
-		gribdecoder_->large_position_1_ = large_position_1_value;
-		}
-	if  (request.countValues("GRIB_WIND_LARGE_POSITION_2") ) {
-		unsigned long long large_position_2_value = request("GRIB_WIND_LARGE_POSITION_2");
-		gribdecoder_->large_position_2_ = large_position_2_value;
-		}
-	if  (request.countValues("GRIB_WIND_LARGE_POSITION_COLOUR") ) {
-		unsigned long long large_colour_position_value = request("GRIB_WIND_LARGE_POSITION_COLOUR");
-		gribdecoder_->large_colour_position_ = large_colour_position_value;
-		}
 	if  (request.countValues("GRIB_MISSING_VALUE_INDICATOR") ) {
 		double missing_value_value = request("GRIB_MISSING_VALUE_INDICATOR");
 		gribdecoder_->missing_value_ = missing_value_value;

src/params/GribDecoder.xml

@@ -191,7 +191,7 @@ does it submit to any jurisdiction.
 			name="grib_wind_position_colour">
 			<documentation>The position in the input file of a wind component field used to colour the flag</documentation>
 		</parameter>
-		<parameter member="large_position_1"
+		<!--parameter member="large_position_1"
 			to="unsigned long long"
 			default="0"
 			from="unsigned long long"
@@ -211,7 +211,7 @@ does it submit to any jurisdiction.
 			from="unsigned long long" 
 			name="grib_wind_large_position_colour">
 			<documentation>The position in the input file of a wind component field used to colour the flag</documentation>
-		</parameter>
+		</parameter-->
 		<parameter from="float"
 			name="grib_missing_value_indicator"
 			visible="false"