change units from EJ->TWh and clean up

config/config.default.yaml

@@ -631,7 +631,7 @@ sector:
   solid_biomass_import:
     enable: false
     price: 54 #EUR/MWh
-    max_amount: 5 #EJ
+    max_amount: 1390 # TWh
     upstream_emissions_factor: .1 #share of solid biomass CO2 emissions at full combustion
 
 # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#industry

scripts/prepare_sector_network.py

@@ -2287,24 +2287,17 @@ def add_biomass(n, costs):
 
     if options["solid_biomass_import"].get("enable", False):
         biomass_import_price = options["solid_biomass_import"]["price"]
-        biomass_import_max_amount = round(
-            options["solid_biomass_import"]["max_amount"] * 1e9 / 3.6, 0
-        )  # EJ --> MWh
-        biomass_import_upstream_emissions = round(
-            options["solid_biomass_import"]["upstream_emissions_factor"]
-            * costs.at["solid biomass", "CO2 intensity"],
-            4,
-        )
-
-        print(
-            "Adding biomass import with cost",
-            biomass_import_price,
-            "EUR/MWh, a limit of",
-            options["solid_biomass_import"]["max_amount"],
-            "EJ, and embedded emissions of",
-            options["solid_biomass_import"]["upstream_emissions_factor"] * 100,
-            "%",
+        # convert TWh in MWh
+        biomass_import_max_amount = options["solid_biomass_import"]["max_amount"] * 1e6
+        biomass_import_upstream_emissions = options["solid_biomass_import"]["upstream_emissions_factor"]
+        
+        logger.info(
+        "Adding biomass import with cost %.2f EUR/MWh, a limit of %.2f TWh, and embedded emissions of %.2f%%",
+        biomass_import_price,
+        options["solid_biomass_import"]["max_amount"],
+        biomass_import_upstream_emissions * 100
         )
+        
 
         n.add("Carrier", "solid biomass import")
 
@@ -2334,7 +2327,7 @@ def add_biomass(n, costs):
             bus2="co2 atmosphere",
             carrier="solid biomass import",
             efficiency=1.0,
-            efficiency2=biomass_import_upstream_emissions,
+            efficiency2=biomass_import_upstream_emissions* costs.at["solid biomass", "CO2 intensity"],
             p_nom_extendable=True,
         )