asdfr

asdf
NREL · Mar 22, 2024 · d6cf460 · d6cf460
2 parents b6840b7 + be4860f
commit d6cf460
Show file tree

Hide file tree

Showing 26 changed files with 20,065 additions and 3,567 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,6 +33,7 @@ var/
 # Installer logs
 pip-log.txt
 pip-delete-this-directory.txt
+pip-wheel-metadata/
 
 # Unit test / coverage reports
 htmlcov/
@@ -100,7 +101,11 @@ ENV/
 tests/results/
 
 # PVDEMICE temp folder
+<<<<<<< HEAD
 PV_ICE/TEMP/
 
 # Traning Jupyter-book
-training/_build/
+training/_build/
+=======
+# PV_ICE/TEMP/
+>>>>>>> be4860f9b4c2ce5a2b887e2d153f7cfea32b3a6c
diff --git a/PV_ICE/baselines/RELOG/baseline_modules_mass_US_CdTe.csv b/PV_ICE/baselines/RELOG/baseline_modules_mass_US_CdTe.csv
diff --git a/PV_ICE/baselines/RELOG/baseline_modules_mass_US_cSi.csv b/PV_ICE/baselines/RELOG/baseline_modules_mass_US_cSi.csv
diff --git a/PV_ICE/baselines/SupportingMaterial/energy-input-cellproduction.xlsx b/PV_ICE/baselines/SupportingMaterial/energy-input-cellproduction.xlsx
diff --git a/PV_ICE/baselines/SupportingMaterial/energy-input-module_mfg.csv b/PV_ICE/baselines/SupportingMaterial/energy-input-module_mfg.csv
diff --git a/PV_ICE/baselines/baseline_material_transport_glass.csv b/PV_ICE/baselines/baseline_material_transport_glass.csv
diff --git a/PV_ICE/baselines/baseline_modules_transport.csv b/PV_ICE/baselines/baseline_modules_transport.csv