Add support for getting CH4 and CO a priori from the profile file.

Author: gmcgarragh

input/common/config/config_common.lua

@@ -950,11 +950,11 @@ function ConfigCommon:reference_co2_apriori_met_apriori()
 end
 
 ------------------------------------------------------------
---- Get co2 apriori for the profile file
+--- Get co2 apriori from the profile file
 ------------------------------------------------------------
 
 function ConfigCommon:co2_profile_file_apriori()
-   local t = CO2ProfilePrior(self.config.met, self.config:h_co2_profile())
+   local t = CO2ProfilePrior(self.config.met, self.config:h_co2_profile(), "CO2Prior/co2_prior_profile_cpr")
    return t:apriori_vmr(self.config.pressure)
 end
 
@@ -1000,6 +1000,15 @@ function ConfigCommon:reference_ch4_apriori_met_apriori()
    return t:apriori_vmr(self.config.pressure)
 end
 
+------------------------------------------------------------
+--- Get ch4 apriori from the profile file
+------------------------------------------------------------
+
+function ConfigCommon:ch4_profile_file_apriori()
+   local t = CO2ProfilePrior(self.config.met, self.config:h_co2_profile(), "CH4Prior/ch4_prior_profile_cpr")
+   return t:apriori_vmr(self.config.pressure)
+end
+
 ------------------------------------------------------------
 --- Load the CO VMR object
 ------------------------------------------------------------
@@ -1021,6 +1030,15 @@ function ConfigCommon:reference_co_apriori_met_apriori()
    return t:apriori_vmr(self.config.pressure)
 end
 
+------------------------------------------------------------
+--- Get co apriori from the profile file
+------------------------------------------------------------
+
+function ConfigCommon:co_profile_file_apriori()
+   local t = CO2ProfilePrior(self.config.met, self.config:h_co2_profile(), "COPrior/co_prior_profile_cpr")
+   return t:apriori_vmr(self.config.pressure)
+end
+
 ------------------------------------------------------------
 -- Short cut for making a flag array. This takes a size, creates
 -- a bool array of that size and sets everything in the passed

lib/Implementation/co2_profile_prior.cc

@@ -8,7 +8,7 @@ using namespace blitz;
 #include "register_lua.h"
 REGISTER_LUA_CLASS(CO2ProfilePrior)
 .def(luabind::constructor<const OcoMetFile&,
-     const HdfFile&>())
+     const HdfFile&, const std::string&>())
 .def("apriori_vmr", &CO2ProfilePrior::apriori_vmr)
 REGISTER_LUA_END()
 #endif
@@ -19,11 +19,11 @@ REGISTER_LUA_END()
 
 CO2ProfilePrior::CO2ProfilePrior
 (const OcoMetFile& Met_file,
- const HdfFile& Profile_file)
+ const HdfFile& Profile_file,
+ const std::string& field)
 : model_press(Met_file.pressure_levels())
 {
   boost::shared_ptr<HdfSoundingId> hsid = Met_file.sounding_id();
-  std::string field = "CO2Prior/co2_prior_profile_cpr";
   TinyVector<int, 3> sz = Profile_file.read_shape<3>(field);
   Array<double, 3> traw = Profile_file.read_field<double, 3>
     (field,

lib/Implementation/co2_profile_prior.h

@@ -12,7 +12,8 @@ namespace FullPhysics {
 class CO2ProfilePrior: public Printable<CO2ProfilePrior> {
 public:
   CO2ProfilePrior(const OcoMetFile& Met_file,
-		  const HdfFile& Profile_file);
+		  const HdfFile& Profile_file,
+                  const std::string& field);
   virtual ~CO2ProfilePrior() {}
   blitz::Array<double, 1> apriori_vmr(const Pressure& pressure) const;
   virtual void print(std::ostream& Os) const { Os << "CO2ProfilePrior";}

lib/Implementation/co2_profile_prior.i

@@ -14,7 +14,8 @@ namespace FullPhysics {
 class CO2ProfilePrior: public GenericObject {
 public:
   CO2ProfilePrior(const OcoMetFile& Met_file,
-		  const HdfFile& Profile_file) {}
+		  const HdfFile& Profile_file,
+                  const std::string& field) {}
   blitz::Array<double, 1> apriori_vmr(const Pressure& pressure) const;
 };
 }