Fixed #2276 - Add support for deriving zonal and meridional winds for…

… MPAS model outputs (#2290)

* Fixed #2276

* Fixed memory leak

* Check return code

include/vapor/DCMPAS.h

@@ -260,9 +260,6 @@ class VDF_API DCMPAS : public VAPoR::DC {
  bool _isCoordVar(string varname) const;
  bool _isDataVar(string varname) const;
 
- template <class T>
- int _getVar(size_t ts, string varname, T *buf);
-
  int _read_nEdgesOnCell(size_t ts);
  void _addMissingFlag(int *data) const;
  int _readVarToSmartBuf(
@@ -362,6 +359,72 @@ class VDF_API DCMPAS : public VAPoR::DC {
  };
 
 
+
+ // Derive Uzonal and Umeridional data variable 
+ //
+ class DerivedZonalMeridonal : public DerivedDataVar {
+ public: 
+  DerivedZonalMeridonal(
+	string derivedVarName, DC *dc, NetCDFCollection *ncdfc,
+	string normalVarName, string tangentialVarName, bool zonalFlag
+  );
+
+  int Initialize();
+
+  bool GetBaseVarInfo(
+	DC::BaseVar &var
+  ) const;
+
+  bool GetDataVarInfo(
+	DC::DataVar &cvar
+  ) const;
+
+  virtual std::vector <string> GetInputs() const {
+	return(std::vector <string> {_normalVarName, _tangentialVarName});
+  }
+
+
+  int GetDimLensAtLevel(
+    int , std::vector <size_t> &dims_at_level,
+    std::vector <size_t> &bs_at_level
+  ) const;
+
+  int OpenVariableRead(
+    size_t ts, int , int 
+  );
+
+  int CloseVariable(int fd);
+
+
+  int ReadRegionBlock(
+	int fd,
+    const vector <size_t> &min, const vector <size_t> &max, float *region
+  ) {
+	return(ReadRegion(fd, min, max, region));
+  }
+
+  int ReadRegion(
+	int fd,
+    const vector <size_t> &min, const vector <size_t> &max, float *region
+  );
+
+  bool VariableExists(
+	size_t ts,
+	int ,
+	int 
+  ) const;
+
+ private:
+  DC *_dc;
+  NetCDFCollection *_ncdfc;
+  string _normalVarName;
+  string _tangentialVarName;
+  bool _zonalFlag;
+  DC::DataVar _dataVarInfo;
+
+ };
+
+
 };
 };