CMP: Multiple consumers for floorspace and reisdential energy demand

cvs/objects/build/xcode3/objects.xcodeproj/project.pbxproj

@@ -2179,6 +2179,7 @@
 				CD488754122873C200F5A88A /* co2_emissions.cpp in Sources */,
 				CD488756122873C200F5A88A /* emissions_summer.cpp in Sources */,
 				CDAACD88216C546D00D13FD6 /* supply_demand_curve_saver.cpp in Sources */,
+				CD488758122873C200F5A88A /* ghg_factory.cpp in Sources */,
 				4BC45CF32717DF19001B7DF6 /* building_gompertz_function.cpp in Sources */,
 				CD693FA01AEFE0CE00805384 /* relative_cost_logit.cpp in Sources */,
 				CD48875B122873C200F5A88A /* input_driver.cpp in Sources */,

cvs/objects/functions/include/building_node_input.h

@@ -114,6 +114,7 @@ class SatiationDemandFunction;
 class BuildingNodeInput : public INestedInput
 {
 friend class GompertzDemandFunction;
+friend class XMLDBOutputter;
 public:
     BuildingNodeInput();
     ~BuildingNodeInput();
@@ -422,6 +423,9 @@ friend class GompertzDemandFunction;
         //! The base floorspace parameter to use during calcDemand. Parsed from XML
         DEFINE_VARIABLE(SIMPLE, "b-param", mbParam, Value),
 
+        //! The base floorspace parameter to use during calcDemand. Parsed from XML
+        DEFINE_VARIABLE(SIMPLE, "tot-dens", mTotDens, Value),
+
         //! The income parameter to use during calcDemand. Parsed from XML
         DEFINE_VARIABLE(SIMPLE, "income-param", mIncomeParam, Value),
 

cvs/objects/functions/include/building_service_function.h

@@ -50,6 +50,7 @@
 #include "functions/include/aproduction_function.h"
 
 class IInput;
+class BuildingNodeInput;
 class BuildingServiceInput;
 
 /*!
@@ -80,9 +81,11 @@ class BuildingServiceFunction : public AProductionFunction {
                             double capitalStock = 0, const IInput* aParentInput = 0 ) const;
 
 
+
     double calcLevelizedCost( const InputSet& aInputs, const std::string& aRegionName,
                               const std::string& aSectorName, int aPeriod, double aAlphaZero, double aSigma,
                               const IInput* aParentInput = 0 ) const;
+
 
     // AProductionFunction methods not implemented
     double changeElasticity( InputSet& input, const std::string& aRegionName, double priceReceived,
@@ -139,8 +142,21 @@ class BuildingServiceFunction : public AProductionFunction {
 
     double calcServiceDensity( BuildingServiceInput* aBuildingServiceInput,
                                const double aIncome,
+                               const double aBasePrice,
                                const std::string& aRegionName,
                                const int aPeriod ) const;
+
+    double calcServiceCoal(BuildingServiceInput* aBuildingServiceInput,
+        const double aIncome,
+        const double aBasePrice,
+        const std::string& aRegionName,
+        const int aPeriod)  const;
+
+    double calcServiceTradBio(BuildingServiceInput* aBuildingServiceInput,
+        const double aIncome,
+        const double aBasePrice,
+        const std::string& aRegionName,
+        const int aPeriod)  const;
 };
 
 #endif // _BUILDING_SERVICE_FUNCTION_H_

cvs/objects/functions/include/building_service_input.h

@@ -88,13 +88,15 @@ class BuildingServiceInput : public INestedInput
 
     // Building service specific methods
     void setServiceDensity( const double aServiceDensity, const int aPeriod );
-    
-    SatiationDemandFunction* getSatiationDemandFunction() const;
+
+   SatiationDemandFunction* getSatiationDemandFunction() const;
 
     virtual double calcThermalLoad( const BuildingNodeInput* aBuildingInput,
                                     const double aInternalGainsPerSqMeter,
                                     const int aPeriod ) const;
 
+	virtual double getBiasAdder(const int aPeriod) const;
+
     // INestedInput methods
     // define them to do nothing since a BuildingServiceInput is a leaf in the nesting structure
     // this should be the end point for recursion
@@ -188,7 +190,25 @@ class BuildingServiceInput : public INestedInput
     virtual void setPricePaid( const double aPricePaid,
                                const int aPeriod );
 
-    virtual double getCoefficient( const int aPeriod ) const;
+    virtual double getCoefficient(const int aPeriod) const;
+
+	virtual double getCoef() const;
+
+    virtual double getCoalA() const;
+
+    virtual double getCoalK() const;
+
+    virtual double getCoalBase() const;
+
+    virtual double getTradBioX() const;
+
+    virtual double getTradBioY() const;
+
+    virtual double getTradBioBase() const;
+
+    virtual double getServPriceBase() const;
+
+    virtual double getServBaseDens() const;    
 
     virtual void setCoefficient( const double aCoefficient,
                                  const int aPeriod );
@@ -298,17 +318,47 @@ class BuildingServiceInput : public INestedInput
 
     // Define data such that introspection utilities can process the data from this
     // subclass together with the data members of the parent classes.
-    DEFINE_DATA_WITH_PARENT(
-        INestedInput,
+	DEFINE_DATA_WITH_PARENT(
+		INestedInput,
 
-        //! The name of this input.
-        DEFINE_VARIABLE( SIMPLE, "name", mName, std::string ),
+		//! The name of this input.
+		DEFINE_VARIABLE(SIMPLE, "name", mName, std::string),
 
-        //! Building service demand by period.
-        DEFINE_VARIABLE( ARRAY | STATE, "base-service", mServiceDemand, objects::PeriodVector<Value> ),
+		//! Building service demand by period.
+		DEFINE_VARIABLE(ARRAY | STATE, "base-service", mServiceDemand, objects::PeriodVector<Value>),
 
         //! Energy service density for reporting.
-        DEFINE_VARIABLE( ARRAY | STATE | NOT_PARSABLE, "service-density", mServiceDensity, objects::PeriodVector<Value> ),
+        DEFINE_VARIABLE(ARRAY | STATE | NOT_PARSABLE, "service-density", mServiceDensity, objects::PeriodVector<Value>),
+
+		//! Demand function coefficients to capture base year thermal characteristics.
+		DEFINE_VARIABLE(SIMPLE | STATE, "coef", mCoef, Value),
+
+		//! Demand function coefficients to capture base year  characteristics.
+		DEFINE_VARIABLE(ARRAY | STATE, "bias-adder", mBiasAdderEn, objects::PeriodVector<Value>),
+
+        //! Demand function coefficients to capture base year  characteristics.
+        DEFINE_VARIABLE(SIMPLE | STATE, "A-coal", mCoalA, Value),
+
+        //! Demand function coefficients to capture base year  characteristics.
+        DEFINE_VARIABLE(SIMPLE | STATE, "k-coal", mCoalK, Value),
+
+        //! Demand function coefficients to capture base year  characteristics.
+        DEFINE_VARIABLE(SIMPLE | STATE, "base-coal", mCoalBase, Value),
+
+        //! Demand function coefficients to capture base year  characteristics.
+        DEFINE_VARIABLE(SIMPLE | STATE, "x-TradBio", mTradBioX, Value),
+
+        //! Demand function coefficients to capture base year  characteristics.
+        DEFINE_VARIABLE(SIMPLE | STATE, "y-TradBio", mTradBioY, Value),
+
+        //! Demand function coefficients to capture base year  characteristics.
+        DEFINE_VARIABLE(SIMPLE | STATE, "base-TradBio", mTradBioBase, Value),
+
+        //! Demand function coefficients to capture base year thermal characteristics.
+        DEFINE_VARIABLE(SIMPLE | STATE, "price", mServPriceBase, Value),
+
+        //! Demand function coefficients to capture base year thermal characteristics.
+        DEFINE_VARIABLE(SIMPLE | STATE, "base-density", mServBaseDens, Value),
 
         //! Satiation demand function.
         DEFINE_VARIABLE( CONTAINER, "satiation-demand-function", mSatiationDemandFunction, SatiationDemandFunction* )

cvs/objects/functions/include/satiation_demand_function.h

@@ -105,8 +105,6 @@ class SatiationDemandFunction : public INamed, private boost::noncopyable {
 
     double calcDemand( const double aDemandDriver ) const;
 
-    void calibrateSatiationImpedance( const double aDemand, const double aDemandDriver, const int aPeriod );
-
     static const std::string& getXMLNameStatic();
 
     // INamed methods
@@ -125,22 +123,27 @@ class SatiationDemandFunction : public INamed, private boost::noncopyable {
         //! The satiation level which may have been parsed directly by the user.
         DEFINE_VARIABLE( SIMPLE, "satiation-level", mParsedSatiationLevel, Value ),
 
+        //! Satiation impedance.  This is the parsed value and will not change.
+        DEFINE_VARIABLE(SIMPLE, "satiation-impedance", mParsedSatiationImpedance, Value),
+
+        //! Satiation adder, determines subsistence level.  This is the parsed value
+        //! and will not change.
+        DEFINE_VARIABLE(SIMPLE, "satiation-adder", mParsedSatiationAdder, Value),
+
         //! The satiation level to use during calcDemand.  This could have been read
         //! in directly by the user or set as a percentage increase from the base year
         //! demand.
         DEFINE_VARIABLE( SIMPLE | STATE | NOT_PARSABLE, "real-satiation-level", mSatiationLevel, Value ),
 
         //! Satiation impedance or midpoint demand driver.  Note that this value is
         //! calibrated via calibrateSatiationImpedance.
-        DEFINE_VARIABLE( SIMPLE | STATE | NOT_PARSABLE, "satiation-impedance", mSatiationImpedance, Value ),
-
-        //! Satiation adder, determines subsistence level.  This is the parsed value
-        //! and will not change.
-        DEFINE_VARIABLE( SIMPLE, "satiation-adder", mParsedSatiationAdder, Value ),
+        DEFINE_VARIABLE( SIMPLE | STATE | NOT_PARSABLE, "real-satiation-impedance", mSatiationImpedance, Value ),     
+
 
         //! Satiation adder, determines subsistence level.  This value may be adjusted
         //! from the parsed value during some calibration periods.
         DEFINE_VARIABLE( SIMPLE | STATE | NOT_PARSABLE, "real-satiation-adder", mSatiationAdder, Value )
+
     )
 
     void copy( const SatiationDemandFunction& aOther );

cvs/objects/functions/include/thermal_building_service_input.h

@@ -108,8 +108,8 @@ class ThermalBuildingServiceInput : public BuildingServiceInput
                                const std::string& aTechName,
                                const IInfo* aTechInfo );
 
-    virtual double getCoefficient( const int aPeriod ) const;
-    
+    virtual double getCoefficient(const int aPeriod) const;
+
     virtual void setCoefficient( const double aCoefficient,
                                  const int aPeriod );
 
@@ -125,9 +125,40 @@ class ThermalBuildingServiceInput : public BuildingServiceInput
 
         //! Degree days by period.
         DEFINE_VARIABLE( ARRAY, "degree-days", mDegreeDays, objects::PeriodVector<Value> ),
-
+
+        //! Demand function coefficients to capture base year thermal characteristics.
+        DEFINE_VARIABLE( SIMPLE | STATE, "coef", mCoef, Value ),
+
+        //! Demand function coefficients to capture base year thermal characteristics.
+        DEFINE_VARIABLE(SIMPLE | STATE, "A-coal", mCoalA, Value),
+
+        //! Demand function coefficients to capture base year thermal characteristics.
+        DEFINE_VARIABLE(SIMPLE | STATE, "k-coal", mCoalK, Value),
+
+        //! Demand function coefficients to capture base year thermal characteristics.
+        DEFINE_VARIABLE(SIMPLE | STATE, "base-coal", mCoalBase, Value),
+
+        //! Demand function coefficients to capture base year thermal characteristics.
+        DEFINE_VARIABLE(SIMPLE | STATE, "x-TradBio", mTradBioX, Value),
+
+        //! Demand function coefficients to capture base year thermal characteristics.
+        DEFINE_VARIABLE(SIMPLE | STATE, "y-TradBio", mTradBioY, Value),
+
+        //! Demand function coefficients to capture base year thermal characteristics.
+        DEFINE_VARIABLE(SIMPLE | STATE, "base-TradBio", mTradBioBase, Value),
+
+        //! Demand function coefficients to capture base year thermal characteristics.
+        DEFINE_VARIABLE(SIMPLE | STATE, "price", mServPriceBase, Value),
+
+        //! Demand function coefficients to capture base year thermal characteristics.
+        DEFINE_VARIABLE(SIMPLE | STATE, "base-density", mServBaseDens, Value),
+
+        //! Demand function coefficients to capture base year thermal characteristics.
+        DEFINE_VARIABLE(ARRAY | STATE, "bias-adder", mBiasAdderEn, objects::PeriodVector<Value>),
+
         //! Demand function coefficients to capture base year thermal characteristics.
         DEFINE_VARIABLE( SIMPLE | STATE | NOT_PARSABLE, "coefficient", mCoefficient, Value )
+
     )
 
     void copy( const ThermalBuildingServiceInput& aInput );

cvs/objects/functions/source/building_function.cpp

@@ -70,7 +70,6 @@ double BuildingFunction::calcCoefficient( InputSet& input, double consumption, c
             / buildingNodeInput->getSubregionalPopulation();
         // first calibrate the satiation impedance
         SatiationDemandFunction* demandFunction = buildingNodeInput->getSatiationDemandFunction();
-        demandFunction->calibrateSatiationImpedance( perCapitaBaseFloorspace, buildingNodeInput->getSubregionalIncome(), period );
     }
     return 1;
 }

cvs/objects/functions/source/building_gompertz_function.cpp

@@ -68,25 +68,34 @@ double GompertzDemandFunction::calcDemand(InputSet& input, double income, const
     double unadjustSatiation = bldInput->mUnadjustSatiation;
     double landDensityParam = bldInput->mLandDensityParam;
     double subregionalPopulation = bldInput->mCurrentSubregionalPopulation;
-    double habitableLand = bldInput->mHabitableLand;
+    double TotDens = bldInput->mTotDens;
     double bParam = bldInput->mbParam;
     double incomeParam = bldInput->mIncomeParam;
     double subregionalIncome = bldInput->mCurrentSubregionalIncome;
     double biasAdjustParam = bldInput->mBiasAdjustParam;
 
-    double pcfloorspace = (unadjustSatiation + (-landDensityParam) * log(subregionalPopulation / habitableLand))
+    double pcfloorspace = (unadjustSatiation + (-landDensityParam) * log(TotDens))
         * exp((-bParam)
             * exp((-incomeParam) * log(subregionalIncome)))
             + biasAdjustParam;
 
+
     // unit conversions to convert from from billion m^2 to m^2
     const double CONV_M2_BM2 = 1e-9;
     // unit conversions to convert from thous ppl to ppl
     const double CONV_POP_THOUS = 1e3;
     double floorspace = pcfloorspace * CONV_M2_BM2 * subregionalPopulation * CONV_POP_THOUS;
 
+
+    // May need to make an adjustment 
+
+    double Basefloorspace = bldInput->mBasepcFlsp * CONV_M2_BM2 * subregionalPopulation * CONV_POP_THOUS;
+
+    if (floorspace < Basefloorspace) {
+        floorspace = Basefloorspace;
+    }
+
     bldInput->setPhysicalDemand(floorspace, regionName, period);
 
     return floorspace;
 }
-

cvs/objects/functions/source/building_node_input.cpp

@@ -77,6 +77,7 @@ BuildingNodeInput::~BuildingNodeInput() {
     delete mSatiationDemandFunction;
 }
 
+
 void BuildingNodeInput::completeInit( const string& aRegionName, const string& aSectorName,
                                       const string& aSubsectorName, const string& aTechName,
                                       const IInfo* aTechInfo)
@@ -216,10 +217,10 @@ void BuildingNodeInput::toDebugXML( const int aPeriod, ostream& aOut, Tabs* aTab
     XMLWriteElement( mFloorToSurfaceRatio[ aPeriod ], "floor-to-surface-ratio", aOut, aTabs );
     XMLWriteElement( mPrice[ aPeriod ], "price", aOut, aTabs );
     XMLWriteElement(mUnadjustSatiation, "unadjust-satiation", aOut, aTabs);
-    XMLWriteElement(mHabitableLand, "habitable-land", aOut, aTabs);
     XMLWriteElement(mBasepcFlsp, "base-pcFlsp", aOut, aTabs);
     XMLWriteElement(mLandDensityParam, "land-density-param", aOut, aTabs);
     XMLWriteElement(mbParam, "b-param", aOut, aTabs);
+    XMLWriteElement(mTotDens, "tot-dens", aOut, aTabs);
     XMLWriteElement(mIncomeParam, "income-param", aOut, aTabs);
     XMLWriteElement(mBiasAdjustParam, "bias-adjust-param", aOut, aTabs);
     XMLWriteElement(mCurrentSubregionalPopulation, "subregional-population", aOut, aTabs);