Merge branch 'develop' of https://github.com/NREL/ssc into itc_basis_updates

Author: brtietz

.github/workflows/ci.yml

@@ -7,7 +7,6 @@ on:
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
-  GTEST_REF: b85864c64758dec007208e56af933fc3f52044ee
   ORTOOLS_VER: "9.14"
   ORTOOLS_RELEASE: "6206"
 
@@ -53,7 +52,6 @@ jobs:
       with:
         repository: google/googletest
         path: googletest
-        ref: ${{env.GTEST_REF}}
 
     - name: build Gtest
       if: steps.cachedgtest.outputs.cache-hit != 'true'
@@ -148,7 +146,6 @@ jobs:
       with:
         repository: google/googletest
         path: googletest
-        ref: ${{env.GTEST_REF}}
 
     - name: build Gtest
       if: steps.cachedgtest.outputs.cache-hit != 'true'
@@ -268,7 +265,6 @@ jobs:
       with:
         repository: google/googletest
         path: googletest
-        ref: ${{env.GTEST_REF}}
 
     - name: build Gtest
       if: steps.cachedgtest.outputs.cache-hit != 'true'

shared/lib_irradproc.h

@@ -89,7 +89,7 @@ void solarpos(int year, int month, int day, int hour, double minute, double lat,
 /** @defgroup solarpos_spa Solar Position Algorithm group/
 *   The functions in this group are used to calculate the sun's position at any given timestep
 *   based on the Solar Position Algorithm reported by Reda and Andreas in NREL/TP-560-34302, 2008.
-*   The functions used in this implementation were taken from a C code implementation provided at https://midcdmz.nrel.gov/spa/
+*   The functions used in this implementation were taken from a C code implementation provided at https://midcdmz.nlr.gov/spa/
 *   @{
 */
 /**

solarpilot/interop.cpp

@@ -2491,7 +2491,7 @@ void grid_emulator_base::AddRow(int row, std::string label, std::string units, d
 	//Row adding method for simple performance runs
 
 	if ((GetNumberCols() < 6) || (GetNumberRows() < row + 1))
-		throw spexception("Sorry! Results table incorrectly formatted. Please contact solarpilot.support@nrel.gov for help.");
+		throw spexception("Sorry! Results table incorrectly formatted. Please contact solarpilot.support@nlr.gov for help.");
 
 	bool is_currency = false;
 	if (units.find("$") != std::string::npos) is_currency = true;

ssc/cmod_pvsamv1.cpp

@@ -3298,7 +3298,7 @@ void cm_pvsamv1::exec()
 
         // calculate system performance factor
         // reference: (http://files.sma.de/dl/7680/Perfratio-UEN100810.pdf)
-        // additional reference: (http://www.nrel.gov/docs/fy05osti/37358.pdf)
+        // additional reference: (http://www.nlr.gov/docs/fy05osti/37358.pdf)
         // PR = net_ac (kWh) / ( total input radiation (kWh) * stc efficiency (%) )
         // bug fix 6/15/15 jmf: total input radiation for PR should NOT including shading or soiling, hence use Nominal value.
         assign("performance_ratio", var_data((ssc_number_t)(ac_net / (nom_rad * mod_eff / 100.0))));

test/input_cases/pvyield_common_data.h

@@ -1255,7 +1255,7 @@ void pvyield_user_support_80603_meteo(ssc_data_t& data)
     ssc_data_set_number(data, "mlm_AM_c_lp3", 0);
     ssc_data_set_number(data, "mlm_AM_c_lp4", 0);
     ssc_data_set_number(data, "mlm_AM_c_lp5", 0);
-    // user support issue 80603 https://sam.nrel.gov/node/80603
+    // user support issue 80603 https://sam.nlr.gov/node/80603
     ssc_data_set_number(data, "mlm_IAM_mode", 3);
     ssc_data_set_number(data, "mlm_IAM_c_as", 0.04);
     ssc_data_set_number(data, "mlm_IAM_c_sa0", 0);
@@ -1696,7 +1696,7 @@ void pvyield_user_support_80603_AZ(ssc_data_t& data)
     ssc_data_set_number(data, "mlm_AM_c_lp3", 0);
     ssc_data_set_number(data, "mlm_AM_c_lp4", 0);
     ssc_data_set_number(data, "mlm_AM_c_lp5", 0);
-    // user support issue 80603 https://sam.nrel.gov/node/80603
+    // user support issue 80603 https://sam.nlr.gov/node/80603
     ssc_data_set_number(data, "mlm_IAM_mode", 3);
     ssc_data_set_number(data, "mlm_IAM_c_as", 0.04);
     ssc_data_set_number(data, "mlm_IAM_c_sa0", 0);

test/shared_test/lib_csp_tes_test.cpp

@@ -34,7 +34,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <gtest/gtest.h>
 
 #include "lib_csp_tes_test.h"
-#include "vs_google_test_explorer_namespace.h"
 #include "csp_common_test.h"
 
 using namespace csp_common;
@@ -45,7 +44,7 @@ const double kErrorToHi = 0.01;      // 1.0%
 //=== Using factory patterns to create the different physical and non-physical components=========
 
 // Test draining storage tank
-NAMESPACE_TEST(csp_common, StorageTank, DrainingTank)
+TEST(StorageTank, DrainingTank)
 {
     bool is_hot_tank = false;
     double dt = 3600.;
@@ -75,7 +74,7 @@ NAMESPACE_TEST(csp_common, StorageTank, DrainingTank)
 }
 
 // Test an initially drained storage tank
-NAMESPACE_TEST(csp_common, StorageTank, InitiallyDrainedTank)
+TEST(StorageTank, InitiallyDrainedTank)
 {
     bool is_hot_tank = false;
     double dt = 3600.;
@@ -188,7 +187,7 @@ double C_to_K(double T) {
     return T + 273.15;
 }
 
-NAMESPACE_TEST(csp_common, TesCspSolver, Default)
+TEST(TesCspSolver, Default)
 {
     std::vector<double> tes_lengths{ 0, 90, 100, 120, 0, 0, 0, 0, 80, 120, 80 };
 
@@ -321,7 +320,7 @@ NAMESPACE_TEST(csp_common, TesCspSolver, Default)
     EXPECT_NEAR(tes.get_cold_temp(), 566.1, 0.1);
 }
 
-NAMESPACE_TEST(csp_common, TesSubcomponentCmod, Default)
+TEST(TesSubcomponentCmod, Default)
 {
     const size_t n_steps = 24;
     ssc_data_t inputs = ssc_data_create();

test/shared_test/lib_csp_trough_test.cpp

@@ -35,15 +35,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #define private public              // for setting private data members
 #include "lib_csp_trough_test.h"
-#include "vs_google_test_explorer_namespace.h"
 
 using namespace csp_trough;
 
 //========Tests===================================================================================
 //=== Using factory patterns to create the different physical and non-physical components=========
 
 // Test a standard trough loop at a single point in time
-NAMESPACE_TEST(csp_trough, TroughLoop, DefaultTest)
+TEST(TroughLoop, DefaultTest)
 {
     DefaultTroughFactory default_trough_factory = DefaultTroughFactory();
     Location location = default_trough_factory.MakeLocation();
@@ -64,7 +63,7 @@ NAMESPACE_TEST(csp_trough, TroughLoop, DefaultTest)
 }
 
 // Test a standard trough loop from a homogenous initial condition to steady-state
-NAMESPACE_TEST(csp_trough, TroughLoop, SteadyStateTest)
+TEST(TroughLoop, SteadyStateTest)
 {
     DefaultTroughFactory default_trough_factory = DefaultTroughFactory();
     Location location = default_trough_factory.MakeLocation();

test/shared_test/lib_solar_thermal_test.cpp

@@ -34,15 +34,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <gtest/gtest.h>
 
 #include "lib_solar_thermal_test.h"
-#include "vs_google_test_explorer_namespace.h"
 
 using namespace solar_thermal;
 
 //========Tests===================================================================================
 //=== Using factory patterns to create the different physical and non-physical components=========
 
 // Basic test of expected power gain and outlet temperature of a single flat plate collector
-NAMESPACE_TEST(solar_thermal, FlatPlateCollectorTest, TestFlatPlateCollectorNominalOperation)
+TEST(FlatPlateCollectorTest, TestFlatPlateCollectorNominalOperation)
 {
     DefaultFpcFactory default_fpc_factory = DefaultFpcFactory();
     std::unique_ptr<FlatPlateCollector> flat_plate_collector = default_fpc_factory.MakeCollector();
@@ -58,7 +57,7 @@ NAMESPACE_TEST(solar_thermal, FlatPlateCollectorTest, TestFlatPlateCollectorNomi
 
 // Basic test of expected power gain and outlet temperature of a flat plate collector array
 // Uses a factory (abstract factory pattern) to create the different physical and non-physical components
-NAMESPACE_TEST(solar_thermal, FlatPlateArrayTest, TestFlatPlateArrayOfOneNominalOperation)
+TEST(FlatPlateArrayTest, TestFlatPlateArrayOfOneNominalOperation)
 {
     DefaultFpcFactory default_fpc_factory = DefaultFpcFactory();
     std::unique_ptr<FlatPlateArray> flat_plate_array = default_fpc_factory.MakeFpcArray();

test/shared_test/vs_google_test_explorer_namespace.h

@@ -34,13 +34,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <gtest/gtest.h>
 #include "etes_etes_defaults.h"
 #include "csp_common_test.h"
-#include "vs_google_test_explorer_namespace.h"
 
 namespace etes_etes_test {}
 using namespace etes_etes_test;
 
 //========Tests===================================================================================
-NAMESPACE_TEST(etes_etes_test, EtesEtesCmod, Default_NoFinancial)
+TEST(EtesEtesCmod, Default_NoFinancial)
 {
     ssc_data_t defaults = etes_etes_defaults();
     CmodUnderTest etes_system = CmodUnderTest("etes_electric_resistance", defaults);