General updates

.github/workflows/unit_tests.yml

@@ -2,16 +2,16 @@ name: Unit Tests
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, develop ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, develop ]
 
 jobs:
   main:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, ubuntu-latest] # windows-latest
+        os: [macos-latest, ubuntu-latest, windows-latest]
         python-version: [3.7, 3.8, 3.9]
     runs-on: ${{ matrix.os }}
     env:
@@ -31,21 +31,24 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install mhkit module (from source)
-        run: python -m pip install -e . "matplotlib<3.4.2"
+        run: python -m pip install -e .
         working-directory: ${{env.mhkit-python-dir}}
       - name: Install mhkit-python-utils module
         run: python -m pip install -e .
-      - name: Create MATLAB batch command
+      - name: Set MATLAB OutOfProcess Python execution mode
+        shell: bash
+        run: echo "pyenv('ExecutionMode', 'OutOfProcess')" > run.m
+        if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' }}
+      - name: Add MATLAB test commands
         shell: bash
-        run: echo "COMMAND=pyenv('ExecutionMode', 'OutOfProcess'), 
-                           version, 
-                           addpath(genpath('mhkit')), 
-                           import matlab.unittest.TestSuite, 
-                           import matlab.unittest.TestRunner, 
-                           testFolder = ['mhkit' filesep 'tests'], 
-                           suite = TestSuite.fromFolder(testFolder), 
-                           runner = TestRunner.withTextOutput,
-                           results = runner.run(suite), 
-                           assertSuccess(results)" >> "$GITHUB_ENV"
+        run: echo "version, 
+                   addpath(genpath('mhkit')), 
+                   import matlab.unittest.TestSuite, 
+                   import matlab.unittest.TestRunner, 
+                   testFolder = ['mhkit' filesep 'tests'], 
+                   suite = TestSuite.fromFolder(testFolder), 
+                   runner = TestRunner.withTextOutput,
+                   results = runner.run(suite), 
+                   assertSuccess(results)" >> run.m
       - name: Install and test MHKiT-MATLAB
-        run: matlab -batch "${{ env.COMMAND }}"
+        run: matlab -batch "run"

.gitignore

@@ -32,3 +32,6 @@ Thumbs.db
 *build
 *.prj
 .gitignore
+
+# Test results
+mhkit/tests/test_results/*

mhkit/river/IO/request_usgs_data.m

@@ -80,6 +80,7 @@
                 + "&siteStatus=all";
 end
 
+
 % Display query
 disp("Data request URL: " + data_url + api_query)
 

mhkit/tests/Wave_TestResourceSpectrum.m

@@ -7,26 +7,12 @@ function test_pierson_moskowitz_spectrum(testCase)
             Obj.Tp = 8;
             Obj.Hs = 2.5;
 
-            S = create_spectra('pierson_moskowitz_spectrum',Obj.f,Obj.Tp,Obj.Hs);
+            S = pierson_moskowitz_spectrum(Obj.f,Obj.Tp,Obj.Hs);
             Tp0 = peak_period(S);
             error = abs(Obj.Tp - Tp0)/Obj.Tp;
             assertLessThan(testCase,error, 0.01);
         end
 
-% This test and function no longer in corresponding Python code
-%         function test_bretschneider_spectrum(testCase)
-%             Obj.f = 0.1/(2*pi):0.01/(2*pi):3.5/(2*pi);
-%             Obj.Tp = 8;
-%             Obj.Hs = 2.5;
-%             
-%             S = create_spectra('bretschneider_spectrum',Obj.f,Obj.Tp,Obj.Hs);
-%             Tp0 = peak_period(S);
-%             Hm0 = significant_wave_height(S);
-%             errorHm0 = abs(Obj.Tp - Tp0)/Obj.Tp;
-%             errorTp0 = abs(Obj.Hs - Hm0)/Obj.Hs;        
-%             assertLessThan(testCase,errorHm0, 0.01);
-%             assertLessThan(testCase,errorTp0, 0.01);
-%         end
 
         function test_surface_elevation_seed(testCase)
             Obj.f = 0.1/(2*pi):0.01/(2*pi):3.5/(2*pi);
@@ -69,7 +55,7 @@ function test_surface_elevation_moments(testCase)
             Obj.t = 0:0.05:Trep;
             dt = Obj.t(2)-Obj.t(1);
 
-            S = create_spectra('jonswap_spectrum',Obj.f, Obj.Tp, Obj.Hs);
+            S = jonswap_spectrum(Obj.f, Obj.Tp, Obj.Hs);
             wave_elevation = surface_elevation(S, Obj.t);
             Sn = elevation_spectrum(wave_elevation.elevation, 1/dt,length(wave_elevation.elevation),Obj.t,"window","boxcar","detrend",false,"noverlap",0);
             m0 = frequency_moment(S,0);

mhkit/tests/runTests.m

@@ -18,7 +18,7 @@
     runner.addPlugin(plugin);
 
     % Add PDF
-    pdfFile = fullfile(testsFolder, 'test_results.pdf');
+    pdfFile = fullfile(htmlFolder, 'test_results.pdf');
     plugin = TestReportPlugin.producingPDF(pdfFile);
     runner.addPlugin(plugin);
 

mhkit/tidal/graphics/plot_tidal_phase_exceedance.m

@@ -98,9 +98,9 @@
 py.importlib.import_module('scipy');
 kwa = pyargs('bounds_error',false);
 
-f_ebb = py.scipy.interpolate.interpolate.interp1d(s_ebb.Discharge,...
+f_ebb = py.scipy.interpolate.interp1d(s_ebb.Discharge,...
     F_ebb, kwa);
-f_flood = py.scipy.interpolate.interpolate.interp1d(s_flood.Discharge,...
+f_flood = py.scipy.interpolate.interp1d(s_flood.Discharge,...
     F_flood, kwa);
 
 F_ebb = double(f_ebb(s_new));

mhkit/tidal/io/request_noaa_data.m

@@ -90,6 +90,7 @@
     elseif is_first_query
         data = data_in_period;
         is_first_query = false;
+
     else
         % Append to existing data structure
         for i = 1:length(timeseries_fields)
@@ -100,6 +101,7 @@
         end
     end
 
+
     start_period_datetime = end_period_datetime + days(1);
 end
 

mhkit/wave/resource/pierson_moskowitz_spectrum.m

@@ -48,3 +48,4 @@
 char_arr=char(S_py.index.values);
 S.frequency=double(py.array.array('d',py.numpy.nditer(S_py.index))).';
 S.Tp=Tp;
+S.Hs = Hs;