oops, fixed lack of parantheses

also Skorea naming in encap file.
NREL · Jan 13, 2025 · da3b2fe · da3b2fe
1 parent 7f1b9d4
commit da3b2fe
Show file tree

Hide file tree

Showing 6 changed files with 778 additions and 1,278 deletions.
diff --git a/PV_ICE/baselines/CarbonLayer/baseline_encapsulant_MFGing_countrymarketshare.csv b/PV_ICE/baselines/CarbonLayer/baseline_encapsulant_MFGing_countrymarketshare.csv
@@ -1,4 +1,4 @@
-,Austria,Brazil,China,France,Germany,India,Italy,Japan,SKorea,Netherlands,Norway,Poland,Saudi Arabia,Singapore,Spain,Taiwan,Thailand,Turkey,United Kingdom,USA
+,Austria,Brazil,China,France,Germany,India,Italy,Japan,South Korea,Netherlands,Norway,Poland,Saudi Arabia,Singapore,Spain,Taiwan,Thailand,Turkey,United Kingdom,USA
 1995,0.89,0.89,40.18,1.79,5.36,10.71,2.68,4.46,5.36,0.89,0.89,0.89,1.79,1.79,0.89,1.79,1.79,4.46,0.89,11.61
 1996,0.89,0.89,40.18,1.79,5.36,10.71,2.68,4.46,5.36,0.89,0.89,0.89,1.79,1.79,0.89,1.79,1.79,4.46,0.89,11.61
 1997,0.89,0.89,40.18,1.79,5.36,10.71,2.68,4.46,5.36,0.89,0.89,0.89,1.79,1.79,0.89,1.79,1.79,4.46,0.89,11.61

diff --git a/PV_ICE/main.py b/PV_ICE/main.py
@@ -1675,7 +1675,7 @@ def calculateCarbonFlows(self, scenarios=None, materials_input=None,
             #select years of carbon data to use in calc based on scen out of 1995-2100
             scenStartYear = int(self.scenario[scen].dataIn_m.iloc[0]['year'])
             scenEndYear = int(self.scenario[scen].dataIn_m.iloc[-1]['year'])
-            if scenStartYear<1995|scenEndYear>2100:
+            if (scenStartYear<1995)|(scenEndYear>2100):
                 print("Scenario years fall outside the carbon baselines, please address.")
                 return
 

diff --git a/docs/baseline development documentation/Test Carbon Code.html b/docs/baseline development documentation/Test Carbon Code.html
@@ -14751,8 +14751,8 @@
 
 <div class="jp-RenderedText jp-OutputArea-output" data-mime-type="text/plain">
 <pre>Trimming and extending  PV_ICE
-PV_ICE aluminium_frames : Data trimmed for Energy, years now encompass  1995  to  2060
-PV_ICE aluminium_frames : Data trimmed for Mass, years now encompass  1995  to  2060
+PV_ICE aluminium_frames : Data trimmed for Energy, years now encompass  1995  to  2102
+PV_ICE aluminium_frames : Data trimmed for Mass, years now encompass  1995  to  2102
 </pre>
 </div>
 </div>
@@ -14835,8 +14835,8 @@
   </thead>
   <tbody>
     <tr>
-      <th>63</th>
-      <td>2058</td>
+      <th>105</th>
+      <td>2100</td>
       <td>152662.6502</td>
       <td>25.07478</td>
       <td>40</td>
@@ -14859,8 +14859,8 @@
       <td>40</td>
     </tr>
     <tr>
-      <th>64</th>
-      <td>2059</td>
+      <th>106</th>
+      <td>2101</td>
       <td>152662.6502</td>
       <td>25.07478</td>
       <td>40</td>
@@ -14883,8 +14883,8 @@
       <td>40</td>
     </tr>
     <tr>
-      <th>65</th>
-      <td>2060</td>
+      <th>107</th>
+      <td>2102</td>
       <td>152662.6502</td>
       <td>25.07478</td>
       <td>40</td>
@@ -14981,8 +14981,8 @@
   </thead>
   <tbody>
     <tr>
-      <th>63</th>
-      <td>2058</td>
+      <th>105</th>
+      <td>2100</td>
       <td>3320.0</td>
       <td>9.5</td>
       <td>0</td>
@@ -14994,8 +14994,8 @@
       <td>670</td>
     </tr>
     <tr>
-      <th>64</th>
-      <td>2059</td>
+      <th>106</th>
+      <td>2101</td>
       <td>3320.0</td>
       <td>9.5</td>
       <td>0</td>
@@ -15007,8 +15007,8 @@
       <td>670</td>
     </tr>
     <tr>
-      <th>65</th>
-      <td>2060</td>
+      <th>107</th>
+      <td>2102</td>
       <td>3320.0</td>
       <td>9.5</td>
       <td>0</td>
@@ -15104,8 +15104,8 @@
   </thead>
   <tbody>
     <tr>
-      <th>63</th>
-      <td>2058</td>
+      <th>105</th>
+      <td>2100</td>
       <td>18.6</td>
       <td>1143.529412</td>
       <td>99.0</td>
@@ -15128,8 +15128,8 @@
       <td>NaN</td>
     </tr>
     <tr>
-      <th>64</th>
-      <td>2059</td>
+      <th>106</th>
+      <td>2101</td>
       <td>18.6</td>
       <td>1143.529412</td>
       <td>99.0</td>
@@ -15152,8 +15152,8 @@
       <td>NaN</td>
     </tr>
     <tr>
-      <th>65</th>
-      <td>2060</td>
+      <th>107</th>
+      <td>2102</td>
       <td>18.6</td>
       <td>1143.529412</td>
       <td>99.0</td>
@@ -15261,8 +15261,8 @@
   </thead>
   <tbody>
     <tr>
-      <th>63</th>
-      <td>2058</td>
+      <th>105</th>
+      <td>2100</td>
       <td>2.24</td>
       <td>22.39</td>
       <td>35.74</td>
@@ -15285,8 +15285,8 @@
       <td>NaN</td>
     </tr>
     <tr>
-      <th>64</th>
-      <td>2059</td>
+      <th>106</th>
+      <td>2101</td>
       <td>2.24</td>
       <td>22.39</td>
       <td>35.74</td>
@@ -15309,8 +15309,8 @@
       <td>NaN</td>
     </tr>
     <tr>
-      <th>65</th>
-      <td>2060</td>
+      <th>107</th>
+      <td>2102</td>
       <td>2.24</td>
       <td>22.39</td>
       <td>35.74</td>