From cf356dd1bcb1265f2c7bb2d20193819e86b29215 Mon Sep 17 00:00:00 2001
From: Ayala <sayala@nrel.gov>
Date: Thu, 23 Sep 2021 14:32:27 -0600
Subject: [PATCH 1/3] git ignore
---
.gitignore | 2 +-
PV_ICE/TEMP/.gitignore | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
create mode 100644 PV_ICE/TEMP/.gitignore
diff --git a/.gitignore b/.gitignore
index bc9d5f9a..2a400795 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,4 +100,4 @@ ENV/
tests/results/
# PVDEMICE temp folder
-PV_ICE/TEMP/
\ No newline at end of file
+# PV_ICE/TEMP/
\ No newline at end of file
diff --git a/PV_ICE/TEMP/.gitignore b/PV_ICE/TEMP/.gitignore
new file mode 100644
index 00000000..86d0cb27
--- /dev/null
+++ b/PV_ICE/TEMP/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
From cb0886a469fb080dd2e098b11b4e63bdcdfa9f89 Mon Sep 17 00:00:00 2001
From: Ayala <sayala@nrel.gov>
Date: Fri, 24 Sep 2021 13:52:11 -0600
Subject: [PATCH 2/3] bug fix
---
PV_ICE/main.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/PV_ICE/main.py b/PV_ICE/main.py
index 050a72ea..30f7bb01 100644
--- a/PV_ICE/main.py
+++ b/PV_ICE/main.py
@@ -450,7 +450,7 @@ def calculateMassFlow(self, weibullInputParams = None,
# and adding initial area
fixinitialareacount = next((i for i, e in enumerate(x) if e), None) - 1
activeareacount[fixinitialareacount] = activeareacount[fixinitialareacount]+row['Area']
- areapowergen[fixinitialareacount] = (activeareacount[fixinitialareacount] +
+ areapowergen[fixinitialareacount] = (areapowergen[fixinitialareacount] +
row['Area'] * row['mod_eff'] *0.01 * row['irradiance_stc'])
except:
# Last value does not have a xclip value of nonzero so it goes
@@ -458,7 +458,7 @@ def calculateMassFlow(self, weibullInputParams = None,
# of Lifetime.
fixinitialareacount = len(cdf)-1
activeareacount[fixinitialareacount] = activeareacount[fixinitialareacount]+row['Area']
- areapowergen[fixinitialareacount] = (activeareacount[fixinitialareacount] +
+ areapowergen[fixinitialareacount] = (areapowergen[fixinitialareacount] +
row['Area'] * row['mod_eff'] *0.01 * row['irradiance_stc'])
print("Finished Area+Power Generation Calculations")
From 8ed90857199ede4d66d155f0a193236a5fe07e0b Mon Sep 17 00:00:00 2001
From: Ayala <sayala@nrel.gov>
Date: Fri, 24 Sep 2021 14:06:20 -0600
Subject: [PATCH 3/3] bug
---
PV_ICE/main.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/PV_ICE/main.py b/PV_ICE/main.py
index 30f7bb01..fabe1b13 100644
--- a/PV_ICE/main.py
+++ b/PV_ICE/main.py
@@ -415,7 +415,7 @@ def calculateMassFlow(self, weibullInputParams = None,
arearepaired = []
arearepaired_powergen = []
areapowergen = []
- active=-1
+ active=0
disposed_projectlifetime=0
for age in range(len(cdf)):
disposed_projectlifetime=0