Merge pull request #179 from piklev/develop

put a minimum on EC shares and modified a constraint on parameter equ…

modules/36_buildings/services_putty/presolve.gms

@@ -236,9 +236,23 @@ p36_shUeCes(ttot,regi_dyn36(regi),entyFe,in,teEs) =  (p36_prodUEintern(ttot,regi
                                           / p36_demUEtotal(ttot,regi,in);
 );
 );
+*** Set 1e-3 as a lower bound for shares
+p36_shUeCes(ttot,regi_dyn36(regi),entyFe,in,teEs) $ ( t36_scen(ttot)
+                                                      AND p36_shUeCes(ttot,regi,entyFe,in,teEs) lt 1e-3)
+                                                      = 0
+                                                      ;
+p36_shUeCes(ttot,regi_dyn36(regi),entyFe,in,teEs) $ ( t36_scen(ttot)
+                                                     AND feteces_dyn36(entyFe,teEs,in)
+                                                     )
+                                                     = p36_shUeCes(ttot,regi,entyFe,in,teEs)
+                                                    / sum( feteces_dyn36_2(entyFe2,teEs2,in),
+                                                    p36_shUeCes(ttot,regi,entyFe2,in,teEs2))
+                                                    ;
+
+
 *** Compute FE shares
 
-p36_shFeCes(t,regi_dyn36(regi),entyFe,in,teEs)$p36_shUeCes(t,regi,entyFe,in,teEs) 
+p36_shFeCes(t,regi_dyn36(regi),entyFe,in,teEs)$feteces_dyn36(entyFe,teEs,in)
                                                 = (1 / p36_fe2es(t,regi,teEs))
                                                  / sum ( (fe2ces_dyn36(entyFe2,esty2,teEs2,in)), (1 / p36_fe2es(t,regi,teEs2))
                                                                          * p36_shUeCes(t,regi,entyFe2,in,teEs2))

modules/36_buildings/services_putty/sets.gms

@@ -123,6 +123,9 @@ uecwsob
  
  fe2ces_dyn36(all_enty,all_esty,all_teEs,all_in) "map FE carriers to CES via appliances"
 // 
+feteces_dyn36(all_enty,all_teEs,all_in) "map FE carriers to CES without esty"
+//
+
 
 inViaEs_dyn36(all_in)  "CES inputs which are provided throught the ES pathway"
 
@@ -231,11 +234,14 @@ loop ( fe2es_dyn36(all_enty,all_esty,all_teEs),
     loop ( es2ppfen_dyn36(all_esty,all_in),
     fe2ces_dyn36(all_enty,all_esty,all_teEs,all_in) = YES;
     inViaEs_dyn36(all_in) = YES;
+    feteces_dyn36(all_enty,all_teEs,all_in) = YES;
     )
     );
 
+
  alias (fe2ces_dyn36,fe2ces_dyn36_2);
  alias (fe2es_dyn36, fe2es_dyn36_2);
+ alias (feteces_dyn36, feteces_dyn36_2);
 
  
 t36_hist(ttot) = NO;

modules/36_buildings/services_with_capital/presolve.gms

@@ -235,9 +235,24 @@ p36_shUeCes(ttot,regi_dyn36(regi),entyFe,in,teEs) =  (p36_prodUEintern(ttot,regi
                                           / p36_demUEtotal(ttot,regi,in);
 );
 );
+
+*** Set 1e-3 as a lower bound for shares
+p36_shUeCes(ttot,regi_dyn36(regi),entyFe,in,teEs) $ ( t36_scen(ttot)
+                                                      AND p36_shUeCes(ttot,regi,entyFe,in,teEs) lt 1e-3)
+                                                      = 0
+                                                      ;
+p36_shUeCes(ttot,regi_dyn36(regi),entyFe,in,teEs) $ ( t36_scen(ttot)
+                                                     AND feteces_dyn36(entyFe,teEs,in)
+                                                     )
+                                                     = p36_shUeCes(ttot,regi,entyFe,in,teEs)
+                                                    / sum( feteces_dyn36_2(entyFe2,teEs2,in),
+                                                    p36_shUeCes(ttot,regi,entyFe2,in,teEs2))
+                                                    ;
+
+
 *** Compute FE shares
 
-p36_shFeCes(t,regi_dyn36(regi),entyFe,in,teEs)$p36_shUeCes(t,regi,entyFe,in,teEs) 
+p36_shFeCes(t,regi_dyn36(regi),entyFe,in,teEs)$feteces_dyn36(entyFe,teEs,in)
                                                 = (1 / p36_fe2es(t,regi,teEs))
                                                  / sum ( (fe2ces_dyn36(entyFe2,esty2,teEs2,in)), (1 / p36_fe2es(t,regi,teEs2))
                                                                          * p36_shUeCes(t,regi,entyFe2,in,teEs2))

modules/36_buildings/services_with_capital/sets.gms

@@ -125,6 +125,9 @@ uecwsob
 fe2ces_dyn36(all_enty,all_esty,all_teEs,all_in) "map FE carriers to CES via appliances"
 // 
 
+feteces_dyn36(all_enty,all_teEs,all_in) "map FE carriers to CES without esty"
+//
+
 inViaEs_dyn36(all_in)  "CES inputs which are provided throught the ES pathway"
 
   in_putty_dyn36(all_in) "putty in for buildings"
@@ -216,11 +219,14 @@ loop ( fe2es_dyn36(all_enty,all_esty,all_teEs),
     loop ( es2ppfen_dyn36(all_esty,all_in),
     fe2ces_dyn36(all_enty,all_esty,all_teEs,all_in) = YES;
     inViaEs_dyn36(all_in) = YES;
+    feteces_dyn36(all_enty,all_teEs,all_in) = YES;
     )
     );
 
+
  alias (fe2ces_dyn36,fe2ces_dyn36_2);
  alias (fe2es_dyn36, fe2es_dyn36_2);
+ alias (feteces_dyn36, feteces_dyn36_2);
  
 t36_hist(ttot) = NO;
 t36_hist(ttot)$(sameAs(ttot,"2005") OR sameAs(ttot,"2010") OR sameAs(ttot,"2015")) = YES;