net billing: allow accrued net billing credits to expire at end of tr…

…ue up period, allow application of net billing credit to current month bill before rollover.
NREL · Sep 11, 2024 · 566c1a8 · 566c1a8
1 parent 1ed432a
commit 566c1a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ssc/cmod_utilityrate5.cpp b/ssc/cmod_utilityrate5.cpp
@@ -2587,7 +2587,6 @@ class cm_utilityrate5 : public compute_module
                     monthly_ec_charges[m] -= monthly_cumulative_excess_dollars[m];
                     payment[c - 1] -= monthly_cumulative_excess_dollars[m];
                     dollars_applied += monthly_cumulative_excess_dollars[m];
-                    monthly_cumulative_excess_dollars[m] = 0;
                 }
                 // Rollover credits at end of true-up period are applied after annual minimums below this section
 

diff --git a/ssc/common.cpp b/ssc/common.cpp
@@ -1021,7 +1021,8 @@ var_info vtab_utility_rate_common[] = {
     { SSC_INPUT,        SSC_NUMBER,     "ur_nm_credit_month",       "Month of year end payout (true-up)",          "mn",       "",                     "Electricity Rates",        "?=11",             "INTEGER,MIN=0,MAX=11",         "SIMULATION_PARAMETER" },
     { SSC_INPUT,        SSC_NUMBER,     "ur_nm_credit_rollover",    "Apply net metering true-up credits to future bills", "0/1", "0=disable,1=enable", "Electricity Rates",        "?=0",              "INTEGER,MIN=0,MAX=1",          "SIMULATION_PARAMETER" },
     { SSC_INPUT,        SSC_NUMBER,     "ur_monthly_fixed_charge",  "Monthly fixed charge",                        "$",        "",                     "Electricity Rates",        "?=0.0",            "",                             "SIMULATION_PARAMETER" },
-
+    { SSC_INPUT,        SSC_NUMBER,     "ur_nb_credit_expire",       "Credit is lost upon end of year        ", "0/1",  "0=disable,1=enable",     "Electricity Rates",        "?=0",              "INTEGER,MIN=0,MAX=1",          "" },
+    { SSC_INPUT,        SSC_NUMBER,     "ur_nb_apply_credit_current_month", "Apply earned credits to balance before rolling over excess        ", "0/1",  "0=disable,1=enable",     "Electricity Rates",        "?=0",              "INTEGER,MIN=0,MAX=1",          "" },
 
     // optional input that allows sell rates to be overridden with buy rates - defaults to not override
     { SSC_INPUT,        SSC_NUMBER,     "ur_sell_eq_buy",           "Set sell rate equal to buy rate",              "0/1",     "Optional override",    "Electricity Rates",        "?=0",              "BOOLEAN",                      "SIMULATION_PARAMETER" },