Rework jpd generation for better file checking, naming

Author: mjprilliman

deploy/runtime/ui/Marine Wave Resource Time Series.json

@@ -1069,9 +1069,9 @@
         "\t\t\t}",
         "\t\t\trescanlibrary('wave');",
         "\t\t\tvalue('wave_resource_filename', file);\r",
-        "\t\t\tf_name = value( 'wave_resource_filename' );\r",
-        "\t\t\tf_name = slash_back_to_forward( f_name );\r",
-        "\t\t\tupdate_library_folders( path_only( f_name ) );\r",
+        "\t\t\t//f_name = value( 'wave_resource_filename' );\r",
+        "\t\t\t//f_name = slash_back_to_forward( f_name );\r",
+        "\t\t\t//update_library_folders( path_only( f_name ) );\r",
         "\t\t\t//value( 'location', file_to_key( f_name ) );",
         "\t\t\t//value('name', name);\r",
         "\t\t\t//value('name', value('location'));",

src/invoke.cpp

@@ -4429,7 +4429,7 @@ void fcall_makejpdfile(lk::invoke_t& cxt)
     UICallbackContext& cc = *(UICallbackContext*)cxt.user_data();
     Library* reloaded = 0;
     wxString file(cxt.arg(0).as_string().Lower());
-    WaveResourceTSData_makeJPD(file, true);
+    WaveResourceTSData_makeJPD(file, 0, true);
     wxString wave_resource_db = SamApp::GetUserLocalDataDir() + "/WaveResourceData.csv";
     ScanWaveResourceData(wave_resource_db, true);
     reloaded = Library::Load(wave_resource_db);
@@ -4463,60 +4463,46 @@ void fcall_make_jpd_multiyear(lk::invoke_t& cxt)
     ssc_number_t* period_arr;
     ssc_number_t* height_bin;
     ssc_number_t* period_bin;
+    ssc_number_t* resource_matrix;
+    ssc_number_t* resource_matrix_total;
+    util::matrix_t<double> resource_matrix_jpd;
+    int matrix_rows = 0;
+    int matrix_cols = 0;
     ssc_number_t* year_arr;
     ssc_number_t* month_arr;
     ssc_number_t* day_arr;
     ssc_number_t* hour_arr;
     ssc_number_t* min_arr;
     const char* str;
-    wxCSVData csv;
-    csv(0, 0) = "Source";
-    csv(0, 1) = "Location ID";
-    csv(0, 2) = "Jurisdiction";
-    csv(1, 2) = "Federal";
-    csv(0, 3) = "Latitude";
-    csv(0, 4) = "Longitude";
-    csv(0, 5) = "Time Zone";
-    csv(1, 5) = "0";
-    csv(0, 6) = "Local Time Zone";
-    csv(0, 7) = "Distance to Shore";
-    csv(0, 8) = "Directionality Coefficient";
-    csv(1, 8) = "-";
-    csv(0, 9) = "Energy Period";
-    csv(1, 9) = "s";
-    csv(0, 10) = "Maximum Energy Direction";
-    csv(1, 10) = "deg";
-    csv(0, 11) = "Mean Absolute Period";
-    csv(1, 11) = "s";
-    csv(0, 12) = "Mean Wave Direction";
-    csv(1, 12) = "deg";
-    csv(0, 13) = "Mean Zero - Crossing Period";
-    csv(1, 13) = "s";
-    csv(0, 14) = "Omni - Directional Wave Power";
-    csv(1, 14) = "W/m";
-    csv(0, 15) = "Peak Period";
-    csv(1, 15) = "s";
-    csv(0, 16) = "Significant Wave Height";
-    csv(1, 16) = "m";
-    csv(0, 17) = "Spectral Width";
-    csv(1, 17) = "-";
-    csv(0, 18) = "Water Depth";
-    csv(0, 19) = "Version";
-    csv(1, 19) = "v1.0.0";
-
-    csv(2, 0) = "Year";
-    csv(2, 1) = "Month";
-    csv(2, 2) = "Day";
-    csv(2, 3) = "Hour";
-    csv(2, 4) = "Minute";
-    csv(2, 5) = "Significant Wave Height";
-    csv(2, 6) = "Energy Period";
 
 
     ssc_number_t val;
     ssc_number_t first_year = 0;
     int nrows;
     int file_count = 0;
+
+    wxCSVData csv;
+    csv(0, 0) = "Name";
+    csv(0, 1) = "City";
+    csv(0, 2) = "State";
+    csv(0, 3) = "Country";
+    csv(0, 4) = "Latitude";
+    csv(0, 5) = "Longitude";
+    csv(0, 6) = "Nearby buoy number";
+    csv(0, 7) = "Average power flux";
+    csv(0, 8) = "Bathymetry";
+    csv(0, 9) = "Sea bed";
+    csv(0, 10) = "Time zone";
+    csv(1, 10) = "tz";
+    csv(0, 11) = "Data source";
+    csv(0, 12) = "Notes";
+
+    ssc_number_t year_min = 9999;
+    ssc_number_t year_max = 9999;
+
+    double num = 0;
+
+
     while (has_more) {
         // process file
         wxString wf = folder + "/" + file;
@@ -4527,55 +4513,71 @@ void fcall_make_jpd_multiyear(lk::invoke_t& cxt)
 
         if (const char* err = ssc_module_exec_simple_nothread("wave_file_reader", pdata))
         {
-            //wxLogStatus("error scanning '" + wf + "'");
+            wxLogStatus("error scanning '" + wf + "'");
             //cxt.error(err);
             cxt.result().assign(err);
-            return;
+            continue;
         }
         else
         {
             if (file_count == 0) {
                 if (ssc_data_get_number(pdata, "location_id", &val))
-                    csv(1, 1) = wxString::Format("%g", val);
+                    csv(1, 0) = wxString::Format("%g", val);
 
-                if (ssc_data_get_number(pdata, "distance_to_shore_file", &val))
-                    csv(1, 7) = wxString::Format("%g", val);
+                
 
-                if (ssc_data_get_number(pdata, "water_depth_file", &val))
-                    csv(1, 18) = wxString::Format("%g", val);
+                
 
                 if (ssc_data_get_number(pdata, "lat", &val)) {
-                    csv(1, 3) = wxString::Format("%g", val);
+                    csv(1, 4) = wxString::Format("%g", val);
+                    //csv(1, 0) = "lat" + wxString::Format("%g", val);
                 }
 
                 if (ssc_data_get_number(pdata, "lon", &val)) {
-                    csv(1, 4) = wxString::Format("%g", val);
+                    csv(1, 5) = wxString::Format("%g", val);
+                    //csv(1, 0) += "_lon" + wxString::Format("%g", val);
+                }
+
+                if ((year_arr = ssc_data_get_array(pdata, "year", &nrows)) != 0)
+                {
+                    year_min = year_arr[0];
+                    year_max = year_arr[0];
                 }
+
+                
                 /*
                 if ((year_arr = ssc_data_get_array(pdata, "year", &nrows)) != 0)
                 {
                     first_year = year_arr[0];
                 }
-                */  
+                */
+
+                //Nearby Buoy
+                csv(1, 6) = "";
+                //Average power flux
+                csv(1, 7) = wxString::Format("%g", std::numeric_limits<double>::quiet_NaN());
+                //Bathymetry
+                csv(1, 8) = "";
+                //Sea Bed
+                csv(1, 9) = "";
 
                 if (ssc_data_get_number(pdata, "tz", &val))
-                    csv(1, 6) = wxString::Format("%g", val);
+                    csv(1, 10) = wxString::Format("%g", val);
 
                 if ((str = ssc_data_get_string(pdata, "data_source")) != 0)
-                    csv(1, 0) = wxString(str);
+                    csv(1, 11) = wxString(str);
+                
 
-                if ((str = ssc_data_get_string(pdata, "notes")) != 0)
-                    csv(1, 19) = wxString(str);
             }
 
             if ((year_arr = ssc_data_get_array(pdata, "year", &nrows)) != 0)
             {
                 for (int i = 0; i < nrows; i++) {
-                    csv(nrows * file_count + i + 3, 0) = wxString::Format("%g", year_arr[i]); //No year for typical wave year file
+                    if (year_arr[0] > year_max) year_max = year_arr[0];
                 }
             }
 
-            if ((month_arr = ssc_data_get_array(pdata, "month", &nrows)) != 0)
+            /*if ((month_arr = ssc_data_get_array(pdata, "month", &nrows)) != 0)
             {
                 for (int i = 0; i < nrows; i++) {
                     csv(nrows * file_count + i + 3, 1) = wxString::Format("%g", month_arr[i]);
@@ -4614,30 +4616,115 @@ void fcall_make_jpd_multiyear(lk::invoke_t& cxt)
                 for (int i = 0; i < nrows; i++) {
                     csv(nrows * file_count + i + 3, 6) = wxString::Format("%g", period_arr[i]);
                 }
+            }*/
+            if ((resource_matrix = ssc_data_get_matrix(pdata, "wave_resource_matrix", &matrix_rows, &matrix_cols)) != 0)
+            {
+                if (file_count == 0) {
+                    //resource_matrix_total = resource_matrix;
+                    resource_matrix_jpd.resize(matrix_rows, matrix_cols);
+                    for (int r = 0; r < matrix_rows; r++) {
+                        for (int c = 0; c < matrix_cols; c++) {
+                            resource_matrix_jpd.at(r, c) = resource_matrix[r * matrix_cols + c];
+                        }
+                    }
+                    
+                }
+                else {
+                    for (int r = 0; r < matrix_rows ; r++) {
+                        for (int c = 0; c < matrix_cols; c++) {
+                            if (c != 0 && r != 0) { //Do not sum headers
+                                //num = resource_matrix[i];
+                                resource_matrix_jpd.at(r, c) += resource_matrix[r * matrix_cols + c]; //Sum
+                                //num = resource_matrix_total[i];
+                            }
+                        }
+                    }
+                }
             }
         }
-        ssc_data_free(pdata);
+        //ssc_data_free(pdata);
 
         has_more = dir.GetNext(&file);
-        file_count++;
-    }
-    //csv(1, 0) += "_" + wxString::Format("%g", first_year + file_count - 1);
-    csv.WriteFile(final_file);
-    wxString err = WaveResourceTSData_makeJPD(final_file, true);
-    cxt.result().assign(err); //return name for library indexing
-    wxString wave_resource_db = SamApp::GetUserLocalDataDir() + "/WaveResourceData.csv";
-    ScanWaveResourceData(wave_resource_db, true);
-    //std::remove(final_file); //Remove multiyear time series file as it doesn't make sense to run in SAM
-    reloaded = Library::Load(wave_resource_db);
-    if (reloaded != 0)
-    {
-        if (&cc != NULL) {
-            std::vector<wxUIObject*> objs = cc.InputPage()->GetObjects();
-            for (size_t i = 0; i < objs.size(); i++)
-                if (LibraryCtrl* lc = objs[i]->GetNative<LibraryCtrl>())
-                    lc->ReloadLibrary();
+        if (has_more) {
+            ssc_data_free(pdata); //if there are more files, delete the var table and start over, if not keep going
+            file_count++;
         }
+        else {
+            file_count++; //Count the file that was just read before exiting
+            for (int r = 0; r < matrix_rows; r++)
+            {
+
+                for (int c = 0; c < matrix_cols; c++)
+                {
+                    if (r != 0 && c != 0) {
+                        resource_matrix_jpd.at(r, c) = resource_matrix_jpd.at(r, c) / file_count; //Normalize percentages
+                    }
+                    csv(2 + r, c) = wxString::Format("%g", resource_matrix_jpd.at(r, c));
+                    if (r == 0 && c == 0) csv(2 + r, c) = "Hs/Te";
+                }
+
+                
+            }
+            csv(1, 12) = wxString::Format("%g", year_min);
+            csv(1, 12) += "-" + wxString::Format("%g", year_max);
+
+            csv(1, 1) = "";
+            csv(1, 2) = "";
+            csv(1, 3) = "";
+            csv(1, 0) = wxString(final_file).substr(0, wxString(final_file).Find(".csv"));
+
+
+            csv.WriteFile(final_file);
+            ssc_data_free(pdata);
+
+        }
+        
     }
+
+    //csv(1, 0) += "_" + wxString::Format("%g", year_min);
+    //csv(1, 0) += "_" + wxString::Format("%g", year_max);
+
+    //csv(1, 1) = "";
+    //csv(1, 2) = "";
+    //csv(1, 3) = "";
+
+    ////for (int i = 0; i < matrix_rows * matrix_cols; i++) {
+    ////    if (i > matrix_cols && fmod(i, matrix_cols) != 0) //Do not sum headers
+    ////        resource_matrix_total[i] = resource_matrix_total[i]/file_count; //Sum 
+    ////}
+
+    //for (int r = 0; r < matrix_rows; r++)
+    //{
+
+    //    for (int c = 0; c < matrix_cols; c++)
+    //    {
+    //        if (r != 0 && c != 0) {
+    //            resource_matrix_total[r * matrix_cols + c] = resource_matrix_total[r * matrix_cols + c] / file_count;
+    //        }
+    //        csv(2 + r, c) = wxString::Format("%g", (resource_matrix_total[r * matrix_cols + c]));
+    //        if (r == 0 && c == 0) csv(2 + r, c) = "Hs/Te";
+    //    }
+
+    //}
+    ////csv(1, 0) += "_" + wxString::Format("%g", first_year + file_count - 1);
+    //ssc_data_free(pdata)
+
+    //csv.WriteFile(final_file);
+    //wxString err = WaveResourceTSData_makeJPD(final_file, resource_matrix_total, true);
+    //cxt.result().assign(err); //return name for library indexing
+    //wxString wave_resource_db = SamApp::GetUserLocalDataDir() + "/WaveResourceData.csv";
+    //ScanWaveResourceData(wave_resource_db, true);
+    ////std::remove(final_file); //Remove multiyear time series file as it doesn't make sense to run in SAM
+    //reloaded = Library::Load(wave_resource_db);
+    //if (reloaded != 0)
+    //{
+    //    if (&cc != NULL) {
+    //        std::vector<wxUIObject*> objs = cc.InputPage()->GetObjects();
+    //        for (size_t i = 0; i < objs.size(); i++)
+    //            if (LibraryCtrl* lc = objs[i]->GetNative<LibraryCtrl>())
+    //                lc->ReloadLibrary();
+    //    }
+    //}
     return;
 }
 

src/library.cpp

@@ -1744,7 +1744,7 @@ bool ScanTidalResourceData(const wxString& db_file, bool show_busy)
     return csv.WriteFile(db_file);
 }
 
-wxString WaveResourceTSData_makeJPD(const wxString& ts_file, bool show_busy)
+wxString WaveResourceTSData_makeJPD(const wxString& ts_file, ssc_number_t* resource_matrix, bool show_busy)
 {
     // TODO - update fields based on final file
     wxBusyInfo* busy = 0;

src/library.h

@@ -107,7 +107,7 @@ bool ShowTidalResourceDataSettings();
 bool ScanWaveResourceData(const wxString &db_file, bool show_busy = false);
 bool ScanWaveResourceTSData(const wxString &db_file, bool show_busy = false);
 bool ScanTidalResourceData(const wxString& db_file, bool show_busy = false);
-wxString WaveResourceTSData_makeJPD(const wxString& db_file, bool show_busy = false);
+wxString WaveResourceTSData_makeJPD(const wxString& db_file, ssc_number_t* resource_matrix = 0, bool show_busy = false);
 
 class LibraryCtrl;
 class wxTextCtrl;