Fix: Flatten additional python input 1d arrays

Author: simmsa

mhkit/wave/performance/capture_length_matrix.m

@@ -45,12 +45,13 @@
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-Hm0 = py.numpy.array(Hm0);
-Te = py.numpy.array(Te);
-L = py.numpy.array(L);
+% Flatten arrays to 1D to handle both row and column vectors
+Hm0 = py.numpy.array(Hm0).flatten();
+Te = py.numpy.array(Te).flatten();
+L = py.numpy.array(L).flatten();
 
-py_Hm0_bins = py.numpy.array(Hm0_bins);
-py_Te_bins = py.numpy.array(Te_bins);
+py_Hm0_bins = py.numpy.array(Hm0_bins).flatten();
+py_Te_bins = py.numpy.array(Te_bins).flatten();
 
 LM = py.mhkit.wave.performance.capture_length_matrix(Hm0, Te, L, statistic, py_Hm0_bins, py_Te_bins);
 

mhkit/wave/performance/mean_annual_energy_production_timeseries.m

@@ -20,10 +20,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-py.importlib.import_module('mhkit');
-
-J=py.numpy.array(J);
-L=py.numpy.array(L);
+% Flatten arrays to 1D to handle both row and column vectors
+J=py.numpy.array(J).flatten();
+L=py.numpy.array(L).flatten();
 
 maep=double(py.mhkit.wave.performance.mean_annual_energy_production_timeseries(L,J));
 

mhkit/wave/performance/wave_energy_flux_matrix.m

@@ -45,13 +45,12 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-py.importlib.import_module('mhkit');
-
-Hm0=py.numpy.array(Hm0);
-Te=py.numpy.array(Te);
-J=py.numpy.array(J);
-Hm0_bins=py.numpy.array(Hm0_bins);
-Te_bins=py.numpy.array(Te_bins);
+% Flatten arrays to 1D to handle both row and column vectors
+Hm0=py.numpy.array(Hm0).flatten();
+Te=py.numpy.array(Te).flatten();
+J=py.numpy.array(J).flatten();
+Hm0_bins=py.numpy.array(Hm0_bins).flatten();
+Te_bins=py.numpy.array(Te_bins).flatten();
 
 JM=py.mhkit.wave.performance.wave_energy_flux_matrix(Hm0,Te,J,statistic,Hm0_bins,Te_bins);
 vals=double(py.array.array('d',py.numpy.nditer(JM.values)));