Merge pull request #996 from NREL/SAM_1232

Address SAM issue 1232 for Detailed PV and PVWattsv8

Author: sjanzou

shared/lib_pv_io_manager.cpp

@@ -211,6 +211,7 @@ Irradiance_IO::Irradiance_IO(compute_module* cm, std::string cmName)
 
 void Irradiance_IO::checkWeatherFile(compute_module* cm, std::string cmName)
 {
+    size_t num_alb_errors = 0;
     for (size_t idx = 0; idx < numberOfWeatherFileRecords; idx++)
     {
         if (!weatherDataProvider->read(&weatherRecord))
@@ -275,11 +276,13 @@ void Irradiance_IO::checkWeatherFile(compute_module* cm, std::string cmName)
         }
         if (useWeatherFileAlbedo && (weatherRecord.alb <= 0 || weatherRecord.alb >= 1))
         {
-            cm->log(util::format("Out of range albedo %lg at time [y:%d m:%d d:%d h:%d minute:%lg], using monthly value",
-                weatherRecord.alb, weatherRecord.year, weatherRecord.month, weatherRecord.day, weatherRecord.hour, weatherRecord.minute), SSC_WARNING, (float)idx);
+            num_alb_errors++;
             weatherRecord.alb = 0;
         }
     }
+    if (num_alb_errors > 0)
+        cm->log(util::format("Weather file albedo has %d invalid values, using monthly value", (int)num_alb_errors), SSC_WARNING);
+
     weatherDataProvider->rewind();
 }
 

ssc/cmod_pvwattsv8.cpp

@@ -842,16 +842,8 @@ class cm_pvwattsv8 : public compute_module
                 {
                     if ((std::isfinite(wf.alb) && (wf.alb > 0 && wf.alb < 1)))
                         alb = wf.alb;
-                    else if (n_alb_errs < 5) // display warning up to 5 times
-                    {
-                        log(util::format("Weather file albedo is not valid. "
-                            "Using default albedo value of %f (snow) or %f (no snow). "
-                            "This warning only appears for the first five instances of this error. "
-                            "[year:%d month:%d day:%d hour:%d minute:%lg]. ",
-                            as_double("albedo_default_snow"), as_double("albedo_default"),
-                            wf.year, wf.month, wf.day, wf.hour, wf.minute), SSC_NOTICE);
+                    else
                         n_alb_errs++;
-                    }
                 }
                 else
                 {
@@ -1373,6 +1365,9 @@ class cm_pvwattsv8 : public compute_module
                 idx_life++;
             }
 
+            if (n_alb_errs > 0)
+                log(util::format("Weather file albedo has %d invalid values, using monthly value", (int)n_alb_errs), SSC_WARNING);
+
             wdprov->rewind();
         }