Uses geopotential_height as altitude when possible

metno · May 27, 2015 · d281800 · d281800
1 parent f6989f4
commit d281800
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 8 deletions.
diff --git a/src/File/Arome.cpp b/src/File/Arome.cpp
@@ -16,7 +16,21 @@ FileArome::FileArome(std::string iFilename, bool iReadOnly) : FileNetcdf(iFilena
 
    mLats = getLatLonVariable("latitude");
    mLons = getLatLonVariable("longitude");
-   mElevs = getLatLonVariable("altitude");
+   if(hasVariableCore("surface_geopotential")) {
+      FieldPtr elevField = getFieldCore("surface_geopotential", 0);
+      mElevs.resize(getNumLat());
+      for(int i = 0; i < getNumLat(); i++) {
+         mElevs[i].resize(getNumLon());
+         for(int j = 0; j < getNumLon(); j++) {
+            float value = (*elevField)(i,j,0) / 9.81;
+            mElevs[i][j] = value;
+         }
+      }
+      std::cout << "Deriving altitude from geopotential height in " << getFilename() << std::endl;
+   }
+   else {
+      mElevs = getLatLonVariable("altitude");
+   }
 
    if(hasVar("time")) {
       NcVar* vTime = getVar("time");
@@ -42,9 +56,12 @@ FileArome::FileArome(std::string iFilename, bool iReadOnly) : FileNetcdf(iFilena
 }
 
 FieldPtr FileArome::getFieldCore(Variable::Type iVariable, int iTime) const {
-   std::string variable = getVariableName(iVariable);
+   std::string variableName = getVariableName(iVariable);
+   return getFieldCore(variableName, iTime);
+}
+FieldPtr FileArome::getFieldCore(std::string iVariable, int iTime) const {
    // Not cached, retrieve data
-   NcVar* var = getVar(variable);
+   NcVar* var = getVar(iVariable);
    int nLat  = mNLat;
    int nLon  = mNLon;
 
@@ -70,7 +87,7 @@ FieldPtr FileArome::getFieldCore(Variable::Type iVariable, int iTime) const {
    }
    else {
       std::stringstream ss;
-      ss << "Cannot read variable '" << variable << "' from '" << getFilename() << "'";
+      ss << "Cannot read variable '" << iVariable << "' from '" << getFilename() << "'";
       Util::error(ss.str());
    }
    float* values = new float[nLat*nLon];

diff --git a/src/File/Arome.h b/src/File/Arome.h
@@ -21,6 +21,7 @@ class FileArome : public FileNetcdf {
    protected:
       void writeCore(std::vector<Variable::Type> iVariables);
       FieldPtr getFieldCore(Variable::Type iVariable, int iTime) const;
+      FieldPtr getFieldCore(std::string iVariable, int iTime) const;
       vec2 getLatLonVariable(std::string iVariable) const;
       int mDate;
 };

diff --git a/src/File/Netcdf.cpp b/src/File/Netcdf.cpp
@@ -17,9 +17,12 @@ FileNetcdf::~FileNetcdf() {
 }
 
 bool FileNetcdf::hasVariableCore(Variable::Type iVariable) const {
-   NcError q(NcError::silent_nonfatal); 
    std::string variable = getVariableName(iVariable);
-   NcVar* var = mFile.get_var(variable.c_str());
+   return hasVariableCore(variable);
+}
+bool FileNetcdf::hasVariableCore(std::string iVariable) const {
+   NcError q(NcError::silent_nonfatal); 
+   NcVar* var = mFile.get_var(iVariable.c_str());
    return var != NULL;
 }
 

diff --git a/src/File/Netcdf.h b/src/File/Netcdf.h
@@ -13,8 +13,6 @@ class FileNetcdf : public File {
       FileNetcdf(std::string iFilename, bool iReadOnly=false);
       ~FileNetcdf();
 
-      // Does this file contain the variable?
-      bool hasVariableCore(Variable::Type iVariable) const;
       virtual std::string getVariableName(Variable::Type iVariable) const = 0;
       //! Add attribute to a variable (overwrite if existing)
       void setAttribute(NcVar* iVar, std::string iName, std::string iValue);
@@ -31,6 +29,10 @@ class FileNetcdf : public File {
       float getOffset(NcVar* iVar) const;
       NcFile mFile;
 
+      // Does this file contain the variable?
+      bool hasVariableCore(Variable::Type iVariable) const;
+      bool hasVariableCore(std::string iVariable) const;
+
       NcDim* getDim(std::string iDim) const;
       NcVar* getVar(std::string iVar) const;
       bool   hasDim(std::string iDim) const;