Merge branch 'main' into 6parsolve

Author: dguittet

.github/workflows/test_pkg.yml

@@ -18,27 +18,17 @@ jobs:
 
     name: ${{ matrix.os }} ${{ matrix.python-version }}
     steps:
-      - uses: actions/checkout@v3
-      - name: Setup conda
-        uses: s-weigand/setup-conda@v1
-        with:
-          update-conda: true
-          python-version: ${{ matrix.python-version }}
-          conda-channels: anaconda, conda-forge
-      - run: conda --version
-      - run: which python
-
       - name: Checkout Repo
         uses: actions/checkout@v3
 
       - name: Get PySAM Version Unix
-        if: ${{ matrix.os != 'windows-latest' }}
+        if: ${{ matrix.os != 'windows-2019' }}
         run: |
           VER=$(python -c "from files.version import __version__; print(__version__)")
           echo "VERSION=$VER" >> $GITHUB_ENV
 
       - name: Get PySAM Version Windows
-        if: ${{ matrix.os == 'windows-latest'}}
+        if: ${{ matrix.os == 'windows-2019'}}
         run: |
           $VER=$(python -c "from files.version import __version__; print(__version__)")
           echo "VERSION=$VER" >> $env:GITHUB_ENV

Examples/100kW_PVWatts.json

@@ -188,9 +188,9 @@
 	"metric_3_label" : "Levelized COE (nominal)",
 	"metric_4" : "lcoe_real",
 	"metric_4_label" : "Levelized COE (real)",
-	"metric_5" : "elec_cost_without_system_year1",
+	"metric_5" : "utility_bill_wo_sys",
 	"metric_5_label" : "Electricity bill without system (year 1)",
-	"metric_6" : "elec_cost_with_system_year1",
+	"metric_6" : "utility_bill_w_sys",
 	"metric_6_label" : "Electricity bill with system (year 1)",
 	"metric_7" : "savings_year1",
 	"metric_7_label" : "Net savings with system (year 1)",

Examples/SelectingModuleandInverterExample/Row2Prism.json

@@ -484,9 +484,9 @@
 	"metric_4_label" : "Levelized COE (nominal)",
 	"metric_5" : "lcoe_real",
 	"metric_5_label" : "Levelized COE (real)",
-	"metric_6" : "elec_cost_without_system_year1",
+	"metric_6" : "utility_bill_wo_sys_year1",
 	"metric_6_label" : "Electricity bill without system (year 1)",
-	"metric_7" : "elec_cost_with_system_year1",
+	"metric_7" : "utility_bill_w_sys_year1",
 	"metric_7_label" : "Electricity bill with system (year 1)",
 	"metric_8" : "savings_year1",
 	"metric_8_label" : "Net savings with system (year 1)",

docs/modules/Cashloan.rst

@@ -105,12 +105,6 @@ Lifetime Group
 .. autoclass:: PySAM.Cashloan.Cashloan.Lifetime
 	:members:
 
-ThirdPartyOwnership Group
---------------------------
-
-.. autoclass:: PySAM.Cashloan.Cashloan.ThirdPartyOwnership
-	:members:
-
 LCOS Group
 -----------
 

docs/modules/CashloanHeat.rst

@@ -113,12 +113,6 @@ Lifetime Group
 .. autoclass:: PySAM.CashloanHeat.CashloanHeat.Lifetime
 	:members:
 
-ThirdPartyOwnership Group
---------------------------
-
-.. autoclass:: PySAM.CashloanHeat.CashloanHeat.ThirdPartyOwnership
-	:members:
-
 LCOS Group
 -----------
 

docs/modules/HostDeveloper.rst

@@ -19,8 +19,6 @@ The variables listed below are interdependent with other variables. If you chang
 
  - construction_financing_cost
 
- - land_area
-
  - om_batt_nameplate
 
  - total_installed_cost

docs/modules/Thirdpartyownership.rst

@@ -57,12 +57,6 @@ CashFlow Group
 .. autoclass:: PySAM.Thirdpartyownership.Thirdpartyownership.CashFlow
 	:members:
 
-ElectricityCost Group
-----------------------
-
-.. autoclass:: PySAM.Thirdpartyownership.Thirdpartyownership.ElectricityCost
-	:members:
-
 Outputs Group
 --------------
 

docs/requirements.txt

@@ -1,3 +1,3 @@
-NREL-PySAM==6.0.0
+NREL-PySAM==6.0.1
 pandas
 sphinx_rtd_theme

files/version.py

@@ -1 +1 @@
-__version__ = '6.0.0'
+__version__ = '6.0.1'

modules/Battery.c

@@ -5211,7 +5211,7 @@ static PyGetSetDef HybridCosts_getset[] = {
 	PyDoc_STR("*sequence*: Annual AC degradation [%]\n\n**Required:**\nFalse. Automatically set to 0.0 if not assigned explicitly or loaded from defaults."),
  	NULL},
 {"land_area", (getter)HybridCosts_get_land_area,(setter)HybridCosts_set_land_area,
-	PyDoc_STR("*float*: Total land area [acres]\n\n**Required:**\nFalse. Automatically set to 0 if not assigned explicitly or loaded from defaults.\n\nThe value of ``land_area`` depends on the following variables:\n\n\t - batt_Qfull\n\t - batt_Vnom_default\n\t - batt_ac_dc_efficiency\n\t - batt_ac_or_dc\n\t - batt_chem\n\t - batt_current_choice\n\t - batt_dc_ac_efficiency\n\t - batt_dc_dc_efficiency\n\t - batt_power_discharge_max_kwac\n"),
+	PyDoc_STR("*float*: Total land area [acres]\n\n**Required:**\nFalse. Automatically set to 0 if not assigned explicitly or loaded from defaults."),
  	NULL},
 {"om_batt_capacity_cost", (getter)HybridCosts_get_om_batt_capacity_cost,(setter)HybridCosts_set_om_batt_capacity_cost,
 	PyDoc_STR("*sequence*: Battery capacity-based System Costs amount [$/kWcap]\n\n**Info:**\nbattery\n\n**Required:**\nFalse. Automatically set to 0.0 if not assigned explicitly or loaded from defaults."),