Delft 3D Timestep to Seconds Function #168

browniea · 2022-04-07T21:11:13Z

This PR outputs the time based on the time step in function convert_time, d3d. get_layer_data and d3d.get_all_data_points. A function to get all timestamps 'get_all_timestamps' will return an array of all the timestamps for a data set.

Additions:
-get_all_timestamps : inputs netcdf4 dataframe and return as all the time stamps for that data set
-convert_time : converts a time_index to a time_stamp in seconds or vice versa

Changes in 'get_layer_data`

'cords_to_layers' dictionary
depth output z : z=[bottom_depth*Layer_percentages[layer_index]]-water_level
updated interpolation for bottom_depth and water_level in wdim coordinate system

Changes in 'get_all_data_points`

'cords_to_layers' dictionary
depth z is pulled from 'get_layer_data` and takes into account water level

ssolson

Hey Emily take a look at these comments and let me know what you think

mhkit/river/io/d3d.py

ssolson

Hey, Emily could you take a look at these comments? Let's do a general review of all docstrings to ensure all the grammar and spelling are clean.

mhkit/river/io/d3d.py

ssolson

d3d.py L256
I would use the try and except to define N.

You currently have

        try:
            len(directions[i]['values'])
        except:
            directions[i]['values'] = np.array([directions[i]['values']])  
            
        N= len(directions[i]['values'])

and make it this:

        try:
            N=len(directions[i]['values'])
        except:
            directions[i]['values'] = np.array([directions[i]['values']])  
            N= len(directions[i]['values'])

mhkit/river/io/d3d.py

browniea · 2022-06-09T01:48:57Z

Changing the d3d.turbulent_intensity function to output TI in a percentage rather than a fraction

TI_data['turbulent_intensity']= np.sqrt(2/3*TI_data['turkin1'])/u_mag * 100

mhkit/river/io/d3d.py

ssolson · 2022-06-09T15:47:01Z

mhkit/river/io/d3d.py

@@ -259,7 +402,7 @@ def get_all_data_points(data, variable, time_index= -1):
    Returns
    -------
    all_data: DataFrame 
-        Dataframe with columns x, y, z, and variable. 
+        Dataframe with columns x, y, z, variable, and time. 


L409: NetCDF4

L410: spelling

L413-L415: I believe this time index should be updated similar to the other where what we are concerned about is the absolute value, again no reason we cannot pass time_index=-2 however the code currently prevents this

Time index still states it must be positive.

mhkit/river/io/d3d.py

ssolson

Hey Emily please check out the couple of comments below.

ssolson

Hey, Emily please see a couple of comments here.

ssolson · 2022-06-21T13:57:44Z

mhkit/river/io/d3d.py

+        A positive integer to pull the time index from the dataset. 0 being closest
+        to time 0. Default is last time index -1.


Says it must be a positive integer and that the default is -1.

Actually now that I think about it the default is not -1 it is None

Do you think we should add the ability to pass negative indices?

The function runs with negative indices, should I add more about indexing in d3d.py. I think it's bested explained with an example as it is in Delft3D_example.

mhkit/river/io/d3d.py

ssolson · 2022-06-21T14:27:40Z

mhkit/river/io/d3d.py

@@ -30,33 +102,94 @@ def get_layer_data(data, variable, layer_index= -1 , time_index=-1):
    Returns
    -------
    layer_data: DataFrame
-        DataFrame with columns of "x" and "y" location on specified layer and 
-        the variable values "v".
+        DataFrame with columns of "x", "y", and "z" location on specified layer, 


What is the definition of "z"?

I defined it as: the value "z" is the depth from the zero-water level at the surface. I did create an issue #172 to change this.

mhkit/river/io/d3d.py

ssolson · 2022-06-21T15:20:46Z

mhkit/river/io/d3d.py

@@ -259,7 +402,7 @@ def get_all_data_points(data, variable, time_index= -1):
    Returns
    -------
    all_data: DataFrame 
-        Dataframe with columns x, y, z, and variable. 
+        Dataframe with columns x, y, z, variable, and time. 


Time index still states it must be positive.

Docstring adjustments

Convert time to 2 wrapper function

… into d3d_2

… d3d_2

* Merge Master into Develop (#179) * Include last day of year (#160) Include the last day of the year when using years parameter. Fixes #154. * Timezone Bug fix: remove `.replace()` for `.astimezone()` (#161) * Bug fix: remove timezone replace for astimezone * add pytz to required packages * Fix: Pandas latest (#159) * Plot each col in DataFrame individually * Remove numpy and pandas version requirements * WDRT (#141) * Working version of Gaussian Copula * Create dedicated function for iso probs and quantiles * Contour plots worsk for single and multiple contours * Gumbel Copula. * Clayton Copula * Rosenblatt Copula * Guass and gumbel general copula * Add support for nonparametric gaussian, clayton, and gumbel copulas * Require statsmodel for nonparametric KDE copulas * Small changes * Fix bug in KDE log transformation * Adding docstrings * All doc strings updated * Add markers option to contours plotting * Add Copula tests comparing to WDRTresults * Fix x1, x2 pts bug in KDE contour, clean up * Example showing the calculation of all copla methods and comparing to WDRT results * Simplifications and lanuguage cleanup * Add statsmodel * Add testing data files * In plot envrionmental contors convert x1,x2 to values if a Series is passed * Docstring typo corrections * Corrected notebook description typos. * module and example for short-term extreme distributions * docstrings for short-term extreme functions * fixes #140 Speedup surface elevation calculation. * correction to surface_elevation * elevation * minor fixes based on review comments * add environmental_contours to init * Remove WDRT functionality * All WDRT contour functionality can be called from one function * Rework tests for new contour functions setup and location * Move all contour example into this file * Update to work with new structure. * Remove all commented out wdrt functions from resource * No changes made. Reverting back. * Have PCA method use general fit. Adds PCAmethod to fit method but can also accept the PCA dictionary. General Docstring Cleanup * Update discussion around the use of the copula method. * Remove copula stand alone notebook * minor formmating changes * Remove test bugs created from merge with origin * Import env contours into resource module and adjust test, examples, ect to function with tthe new structure * Uncommented tests * Remove reference to import the env contours module * fixing minor typo * Move env contours to _file and adjust package to handle new structure * Minor formatting cleanup * Cleanup unsed packages and variables * intial mler upload * formalize functions * add tests and example * sampling rate to averaging period * rename MLER example * working * merging * WDRT functions and examples finalized. Missing tests. * integrate mler into extreme * fixes tests? * fix tests * fix tests * fix full sea state example? * test contour samples * test sample full seastate * random seed * test long term extreme * expand MLER functionality * test short-term extremes * fix mler tests * MLER test error * mler fix 2 * update formats and asserts * further cleanup of countours.py for consistency, typos, and pep8 * run tests? * fix test? * change lists to np.array so they pass the assert statements * clean extreme.py for consistency, pep8 * points_per_interval should be int * typing in examples * full sea state example: make it easier to follow, add more explanation, and use consistent naming * contour example: make it easier to follow, add more explanation, and use consistent naming * Alias ste function and minor formatting. * naming convention * rename example * ste example * allow weights to be np.array * allow weights to be np.ndarray Co-authored-by: ssolson <[email protected]> Co-authored-by: ssolson <[email protected]> Co-authored-by: rpauly18 <[email protected]> Co-authored-by: hivanov-nrel <[email protected]> * DOLfYN IO (#126) * input output files + testing * Code update * Test reformatting * Testing paths * dependency switch from h5netcdf to netcdf4 * Code cleanup * Test import fix * Minor docstring edits * Add dolfyn test data * Test fixes for mhkit * Removing uneeded test files, improving consistency * Not sure why these files didn't upload * Organizational changes and clarifications. Request for additional clarification * Dolfyn codebase updates * Dolfyn example notebooks update * Testing updates * Update example datafile * Latest dolfyn v0.13.0 updates * Name change * input output files + testing * Code update * Organizational changes and clarifications. Request for additional clarification * Dolfyn codebase updates * fix bug and make faster. Un-hard-code default seed/phase. * fix tests * delete commented out tests * retrigger checks * Checkpoint push * New dolfyn data files * Reorganize dolfyn testing * pytest install for warnings tests * Final update for IO * Remove future updates * Ensure file compression runs * Update numpy dependency * trying numpy v1.22 * changing numpy requirements * Remake unittest test cases * Save format options * Add dolfyn view to notebooks * Decode remaining binary ad2cp variables * DOLfYN 1.0.0 dependency Co-authored-by: jmcvey3 <[email protected]> Co-authored-by: ssolson <[email protected]> Co-authored-by: Michelen <[email protected]> Co-authored-by: jmcvey3 <[email protected]> Co-authored-by: rpauly18 <[email protected]> * regenerate WDRT examples (#163) * updating version number in package * fixing dolfyn imports from pip * updating version number for bug fix * NDBC Metocean data (#152) * catch extra header in ndbc data * NDBC cwind example * update unit catch in request_data * update gust plot to show more data * add tests to read cwind with and without units * move graphics import to ndbc module and fix capitalization * use resample, add gridlines, rename variables, replace NDBC nans up front * rename wind_example to metocean_example * adding "Develop" branch to PR Co-authored-by: Carlos A. Michelén Ströfer <[email protected]> Co-authored-by: rpauly18 <[email protected]> Co-authored-by: hivanov-nrel <[email protected]> Co-authored-by: jmcvey3 <[email protected]> Co-authored-by: jmcvey3 <[email protected]> Co-authored-by: jmcvey3 <[email protected]> Co-authored-by: rpauly18 <[email protected]> Co-authored-by: Adam Keester <[email protected]> * Test Suite Restructure (#174) * test_wave file to folder with individual feature files * Move io tests into io folder * Send plots to a plots folder * Move resource characterizations plot tests into resource metrics file * move load tests to folder * move power tests to folder * move river tests to folder * move tidal tests to folder * move utils tests to folder * add inits so that tests pick up the tests in subfolders * Require previous netCDF4 release. * FIx data directory path * Fix data directory path * Fix load data directory path * Remove relpath call to see if it fixes Windows test suite issues * Remove relpath from the rest of io tests in wave * DOLfYN source code (#169) * Initial push * Latest bugfixes * Remove phase-in text * Update docstrings * Readability, imports * Make functions public * Docstring updates * Fix test oversight * Fix docstring * Missing timestamp fix for classic Nortek * Docstring updates * Renaming functions per mhkit standards * Single array vs binned array functions * Reorganizing analysis code * Update invalid orientation matrix warning * Add config details to dataset attributes * dolfyn bugfixes Co-authored-by: jmcvey3 <[email protected]> * Delft 3D Timestep to Seconds Function (#168) * fixing file history * fixing file history * fixing file history * made revisions from ssolson review * changed time_stamp to timestamp * updated varible names * updated variable names * fixed syntax line 63 * umdated variable name * fixed typos in doc strings * ssolson review 5-26-2022 * deleted excessive code in get_all_data * chaged TI to a % from a fraction * adjusted TI test to be a % * fixed doc string for TI function * Docstring adjustments * updated doc strings * Make convert_time a hidden func, make 2 functions to access it * Minor changes to get_lay_data docstring and formatting * small changes * remove print from create_points * example notebook clean up * fixed merge confilics * updated after merge * final developmet barnach merge updates * deleated space * Delete test_river.py * added coverage to test * updated min and max plot labels Co-authored-by: Browning <[email protected]> Co-authored-by: ssolson <[email protected]> * NetCDF4 (#181) * Use conda TEST env on Py 3.7, 3.8, 3.9 * Use pip install with Py 3.8 and 3.9. * Updates for WEC-Sim v5.0 (#185) * update read_wecsim for WEC-Sim v5.0 * add cable class * update notebook with results * add try-except for Morrison (v4.1) vs Morison (v4.2+) * add cable check and dataset to wave tests * update cable dataset * Fix pip install tests (#194) * Require previous version of NetCDF4. * Use original pre install for environemnt in pip tests * Only test pip * No loading shell PATH * Do not upgrade h5py * Set NETCDF to 1.5.8 * pytest and coverage * yaml syntax fix * Change need to pip-build * Control coverage and test via rc files * Move configuration file to workflows directory * Move configuration file to workflows directory * Specify the location of configuration files in coverage/pytest call * run conda & pip, pass both to coveralls * conda bash -l {0} * Add hindcast build which runs serial * configuration files for hindcast run * Specify hindcast configuration for hindcast build * Remove version specification from hindcast calls * Specify configuration files to include/omit hindcast accordingly * Change job name * Fix configuration to hindcast file not test * Use all OS and py versions in tests * pandas <=1.5.0 * xarray <=2022.9.0 * Only hindcast * Clean up package install * Fixing hypy and h5pyd to previous versions * Run limited other tests * No hindcast tests * remove hindcast comments and coveralls call * remove py3.8 from pip build * requirements.txt netCDF <= 1.5.8 * Add function to compute value at a given return period (#193) * Run CI on push to Develop (#200) * Dolfyn general updates (#186) * Initial push * Latest bugfixes * Remove phase-in text * Update docstrings * Readability, imports * Make functions public * Docstring updates * Fix test oversight * Fix docstring * Missing timestamp fix for classic Nortek * Docstring updates * Renaming functions per mhkit standards * Single array vs binned array functions * Reorganizing analysis code * Update invalid orientation matrix warning * Add config details to dataset attributes * dolfyn bugfixes * ADV updates : * Update compression option for netcdf4 * Remove compression options * Fix clean function * Set functions as private * Move stress functions to ADV dir * Add bottleneck to reqs * Minor changes * Remove old functions * Code simplification * Update examples * Make functions public * Add bottleneck to dependencies * Fix notebook * Bugfix for beam vars Co-authored-by: jmcvey3 <[email protected]> * Delft3D z calculation (#190) * updated variable names * updated variable names * updated variable names * fixed a few docstring typos * updated s1 to water level * updated s1 to waterlevel * updated s1 to waterlevel * updated s1 to water level * updated s1 to waterlever * fixed typo depth to waterdepth * added edges = nearest example * added edges = nearest option in variable interpolate * updated z to waterdepth * added edges= nearest example Co-authored-by: Browning <[email protected]> * Directional NDBC (#197) * working on directional NDBC * clean up functions. Write docstrings. Write assert statements. Write tests. Create Tutorial. * docstring and asserts for plotting function * Bug Fix: Averaging histogram bin and wave energy (#205) * Fix averaging bug * Add outline to bin counts text for better contrast * Update plotting function and plot in example notebook * Fix: update variable name to remove reference before assignment error (#208) * update wave.contours.samples_contour to not get variable referenced before assignment error Co-authored-by: Graham Penrose <[email protected]> * HSDS (#211) Adds hindcast tests back into the test suite. The NREL HSDS API issues were resolved by creating multiple calls to the API for direction wave spectrum requests. Additionally, an exponential back-off time was implemented to retry calls with an increased wait time between calls. Co-authored-by: Adam Keester <[email protected]> * Provide function to convert from Te to Tp using ITTC approximation (#210) * Provide function to convert from Te to Tp using ITTC approximation * Apply suggestions from code review Co-authored-by: Adam Keester <[email protected]> * Metocean module - WIND Toolkit (#187) * initial script * update wind_toolkit with 4 regions and 1-hr or 5-min data * update parameters of wind_toolkit functions * compare NDBC and WIND metocean data * fix typo in wpto hindcast example * finish metocean example and add results * add wind_toolkit to wave/io/__init__.py * update WIND Toolkit parameter list * initial test structure for WIND toolkit * finish metocean example * add function to plot each region * wind toolkit tests and test data * add tests for misc wind_toolkit MHKiT functions and cases * fix wind toolkit tests * add elevation_to_string utility function * misc cleanup * clarify available parameters * add users lat_lon to plot_region visualization * update example with new functions * add numpy dependency back in * Ingnore the new hindcast folder * Include only the new hindcast folder * Move hindcast tests to hindcast folder * Specify exclusion of hindcast from standard coverage * update hindcast coverage * remove unnecessary header * move hindcast and wind_toolkit to wave/io/hindcast * update .coveragerc files * update paths for new wave.io.hindcast directory Co-authored-by: ssolson <[email protected]> * Dolfyn updates (#212) * RDI reader, logging, duty cycle motion correction * Updates * Force float32 datatype * Docstring formatting * Change 'default' docstring default * Remove old comments * Trasect comparison (#199) * Require previous version of NetCDF4. * updated variable names * updated variable names * updated variable names * fixed a few docstring typos * updated s1 to water level * updated s1 to waterlevel * updated s1 to waterlevel * updated s1 to water level * updated s1 to waterlever * fixed typo depth to waterdepth * D3d Tanana Transect Example * added optional edge interpolation with nearest * updated z to water depth * RDI reader, logging, duty cycle motion correction * add dolfyn, currenly will not run on the branch need jmcvey3 trdi_5beam * found river bottom and removed data below * Updates * Force float32 datatype * added downsampelind comparison and tried contourf * D3D tanana data * tanana transect 2 * tanana transect 3 * Docstring formatting * Change 'default' docstring default * Remove old comments * updated code to match Energies paper * Review * Boat transect image * updated variable names * updated variable names * updated variable names added to discriptions * Clean up and suggestions * added to the examples * TRTS study edits * code and discription updates * Edits and TODOs * moved files, updated discriptions * readding Delft3D_example notebook * added USGS discharge * updated doc strings * example updates and move data files * updated doc strings and Error equations * updated doc strings * pulled down development branch --------- Co-authored-by: ssolson <[email protected]> Co-authored-by: Browning <[email protected]> Co-authored-by: jmcvey3 <[email protected]> --------- Co-authored-by: Carlos A. Michelén Ströfer <[email protected]> Co-authored-by: rpauly18 <[email protected]> Co-authored-by: hivanov-nrel <[email protected]> Co-authored-by: jmcvey3 <[email protected]> Co-authored-by: jmcvey3 <[email protected]> Co-authored-by: jmcvey3 <[email protected]> Co-authored-by: rpauly18 <[email protected]> Co-authored-by: Adam Keester <[email protected]> Co-authored-by: Emily Browning <[email protected]> Co-authored-by: Browning <[email protected]> Co-authored-by: Mark Bruggemann <[email protected]> Co-authored-by: Graham Penrose <[email protected]>

* Require previous version of NetCDF4. * Merge Master into Develop (#179) * Include last day of year (#160) Include the last day of the year when using years parameter. Fixes #154. * Timezone Bug fix: remove `.replace()` for `.astimezone()` (#161) * Bug fix: remove timezone replace for astimezone * add pytz to required packages * Fix: Pandas latest (#159) * Plot each col in DataFrame individually * Remove numpy and pandas version requirements * WDRT (#141) * Working version of Gaussian Copula * Create dedicated function for iso probs and quantiles * Contour plots worsk for single and multiple contours * Gumbel Copula. * Clayton Copula * Rosenblatt Copula * Guass and gumbel general copula * Add support for nonparametric gaussian, clayton, and gumbel copulas * Require statsmodel for nonparametric KDE copulas * Small changes * Fix bug in KDE log transformation * Adding docstrings * All doc strings updated * Add markers option to contours plotting * Add Copula tests comparing to WDRTresults * Fix x1, x2 pts bug in KDE contour, clean up * Example showing the calculation of all copla methods and comparing to WDRT results * Simplifications and lanuguage cleanup * Add statsmodel * Add testing data files * In plot envrionmental contors convert x1,x2 to values if a Series is passed * Docstring typo corrections * Corrected notebook description typos. * module and example for short-term extreme distributions * docstrings for short-term extreme functions * fixes #140 Speedup surface elevation calculation. * correction to surface_elevation * elevation * minor fixes based on review comments * add environmental_contours to init * Remove WDRT functionality * All WDRT contour functionality can be called from one function * Rework tests for new contour functions setup and location * Move all contour example into this file * Update to work with new structure. * Remove all commented out wdrt functions from resource * No changes made. Reverting back. * Have PCA method use general fit. Adds PCAmethod to fit method but can also accept the PCA dictionary. General Docstring Cleanup * Update discussion around the use of the copula method. * Remove copula stand alone notebook * minor formmating changes * Remove test bugs created from merge with origin * Import env contours into resource module and adjust test, examples, ect to function with tthe new structure * Uncommented tests * Remove reference to import the env contours module * fixing minor typo * Move env contours to _file and adjust package to handle new structure * Minor formatting cleanup * Cleanup unsed packages and variables * intial mler upload * formalize functions * add tests and example * sampling rate to averaging period * rename MLER example * working * merging * WDRT functions and examples finalized. Missing tests. * integrate mler into extreme * fixes tests? * fix tests * fix tests * fix full sea state example? * test contour samples * test sample full seastate * random seed * test long term extreme * expand MLER functionality * test short-term extremes * fix mler tests * MLER test error * mler fix 2 * update formats and asserts * further cleanup of countours.py for consistency, typos, and pep8 * run tests? * fix test? * change lists to np.array so they pass the assert statements * clean extreme.py for consistency, pep8 * points_per_interval should be int * typing in examples * full sea state example: make it easier to follow, add more explanation, and use consistent naming * contour example: make it easier to follow, add more explanation, and use consistent naming * Alias ste function and minor formatting. * naming convention * rename example * ste example * allow weights to be np.array * allow weights to be np.ndarray Co-authored-by: ssolson <[email protected]> Co-authored-by: ssolson <[email protected]> Co-authored-by: rpauly18 <[email protected]> Co-authored-by: hivanov-nrel <[email protected]> * DOLfYN IO (#126) * input output files + testing * Code update * Test reformatting * Testing paths * dependency switch from h5netcdf to netcdf4 * Code cleanup * Test import fix * Minor docstring edits * Add dolfyn test data * Test fixes for mhkit * Removing uneeded test files, improving consistency * Not sure why these files didn't upload * Organizational changes and clarifications. Request for additional clarification * Dolfyn codebase updates * Dolfyn example notebooks update * Testing updates * Update example datafile * Latest dolfyn v0.13.0 updates * Name change * input output files + testing * Code update * Organizational changes and clarifications. Request for additional clarification * Dolfyn codebase updates * fix bug and make faster. Un-hard-code default seed/phase. * fix tests * delete commented out tests * retrigger checks * Checkpoint push * New dolfyn data files * Reorganize dolfyn testing * pytest install for warnings tests * Final update for IO * Remove future updates * Ensure file compression runs * Update numpy dependency * trying numpy v1.22 * changing numpy requirements * Remake unittest test cases * Save format options * Add dolfyn view to notebooks * Decode remaining binary ad2cp variables * DOLfYN 1.0.0 dependency Co-authored-by: jmcvey3 <[email protected]> Co-authored-by: ssolson <[email protected]> Co-authored-by: Michelen <[email protected]> Co-authored-by: jmcvey3 <[email protected]> Co-authored-by: rpauly18 <[email protected]> * regenerate WDRT examples (#163) * updating version number in package * fixing dolfyn imports from pip * updating version number for bug fix * NDBC Metocean data (#152) * catch extra header in ndbc data * NDBC cwind example * update unit catch in request_data * update gust plot to show more data * add tests to read cwind with and without units * move graphics import to ndbc module and fix capitalization * use resample, add gridlines, rename variables, replace NDBC nans up front * rename wind_example to metocean_example * adding "Develop" branch to PR Co-authored-by: Carlos A. Michelén Ströfer <[email protected]> Co-authored-by: rpauly18 <[email protected]> Co-authored-by: hivanov-nrel <[email protected]> Co-authored-by: jmcvey3 <[email protected]> Co-authored-by: jmcvey3 <[email protected]> Co-authored-by: jmcvey3 <[email protected]> Co-authored-by: rpauly18 <[email protected]> Co-authored-by: Adam Keester <[email protected]> * Test Suite Restructure (#174) * test_wave file to folder with individual feature files * Move io tests into io folder * Send plots to a plots folder * Move resource characterizations plot tests into resource metrics file * move load tests to folder * move power tests to folder * move river tests to folder * move tidal tests to folder * move utils tests to folder * add inits so that tests pick up the tests in subfolders * Require previous netCDF4 release. * FIx data directory path * Fix data directory path * Fix load data directory path * Remove relpath call to see if it fixes Windows test suite issues * Remove relpath from the rest of io tests in wave * DOLfYN source code (#169) * Initial push * Latest bugfixes * Remove phase-in text * Update docstrings * Readability, imports * Make functions public * Docstring updates * Fix test oversight * Fix docstring * Missing timestamp fix for classic Nortek * Docstring updates * Renaming functions per mhkit standards * Single array vs binned array functions * Reorganizing analysis code * Update invalid orientation matrix warning * Add config details to dataset attributes * dolfyn bugfixes Co-authored-by: jmcvey3 <[email protected]> * Delft 3D Timestep to Seconds Function (#168) * fixing file history * fixing file history * fixing file history * made revisions from ssolson review * changed time_stamp to timestamp * updated varible names * updated variable names * fixed syntax line 63 * umdated variable name * fixed typos in doc strings * ssolson review 5-26-2022 * deleted excessive code in get_all_data * chaged TI to a % from a fraction * adjusted TI test to be a % * fixed doc string for TI function * Docstring adjustments * updated doc strings * Make convert_time a hidden func, make 2 functions to access it * Minor changes to get_lay_data docstring and formatting * small changes * remove print from create_points * example notebook clean up * fixed merge confilics * updated after merge * final developmet barnach merge updates * deleated space * Delete test_river.py * added coverage to test * updated min and max plot labels Co-authored-by: Browning <[email protected]> Co-authored-by: ssolson <[email protected]> * NetCDF4 (#181) * Use conda TEST env on Py 3.7, 3.8, 3.9 * Use pip install with Py 3.8 and 3.9. * Updates for WEC-Sim v5.0 (#185) * update read_wecsim for WEC-Sim v5.0 * add cable class * update notebook with results * add try-except for Morrison (v4.1) vs Morison (v4.2+) * add cable check and dataset to wave tests * update cable dataset * updated variable names * updated variable names * updated variable names * fixed a few docstring typos * updated s1 to water level * updated s1 to waterlevel * updated s1 to waterlevel * updated s1 to water level * updated s1 to waterlever * fixed typo depth to waterdepth * D3d Tanana Transect Example * Fix pip install tests (#194) * Require previous version of NetCDF4. * Use original pre install for environemnt in pip tests * Only test pip * No loading shell PATH * Do not upgrade h5py * Set NETCDF to 1.5.8 * pytest and coverage * yaml syntax fix * Change need to pip-build * Control coverage and test via rc files * Move configuration file to workflows directory * Move configuration file to workflows directory * Specify the location of configuration files in coverage/pytest call * run conda & pip, pass both to coveralls * conda bash -l {0} * Add hindcast build which runs serial * configuration files for hindcast run * Specify hindcast configuration for hindcast build * Remove version specification from hindcast calls * Specify configuration files to include/omit hindcast accordingly * Change job name * Fix configuration to hindcast file not test * Use all OS and py versions in tests * pandas <=1.5.0 * xarray <=2022.9.0 * Only hindcast * Clean up package install * Fixing hypy and h5pyd to previous versions * Run limited other tests * No hindcast tests * remove hindcast comments and coveralls call * remove py3.8 from pip build * requirements.txt netCDF <= 1.5.8 * Add function to compute value at a given return period (#193) * Run CI on push to Develop (#200) * added optional edge interpolation with nearest * updated z to water depth * Dolfyn general updates (#186) * Initial push * Latest bugfixes * Remove phase-in text * Update docstrings * Readability, imports * Make functions public * Docstring updates * Fix test oversight * Fix docstring * Missing timestamp fix for classic Nortek * Docstring updates * Renaming functions per mhkit standards * Single array vs binned array functions * Reorganizing analysis code * Update invalid orientation matrix warning * Add config details to dataset attributes * dolfyn bugfixes * ADV updates : * Update compression option for netcdf4 * Remove compression options * Fix clean function * Set functions as private * Move stress functions to ADV dir * Add bottleneck to reqs * Minor changes * Remove old functions * Code simplification * Update examples * Make functions public * Add bottleneck to dependencies * Fix notebook * Bugfix for beam vars Co-authored-by: jmcvey3 <[email protected]> * RDI reader, logging, duty cycle motion correction * Delft3D z calculation (#190) * updated variable names * updated variable names * updated variable names * fixed a few docstring typos * updated s1 to water level * updated s1 to waterlevel * updated s1 to waterlevel * updated s1 to water level * updated s1 to waterlever * fixed typo depth to waterdepth * added edges = nearest example * added edges = nearest option in variable interpolate * updated z to waterdepth * added edges= nearest example Co-authored-by: Browning <[email protected]> * Directional NDBC (#197) * working on directional NDBC * clean up functions. Write docstrings. Write assert statements. Write tests. Create Tutorial. * docstring and asserts for plotting function * add dolfyn, currenly will not run on the branch need jmcvey3 trdi_5beam * found river bottom and removed data below * Bug Fix: Averaging histogram bin and wave energy (#205) * Fix averaging bug * Add outline to bin counts text for better contrast * Update plotting function and plot in example notebook * Fix: update variable name to remove reference before assignment error (#208) * update wave.contours.samples_contour to not get variable referenced before assignment error Co-authored-by: Graham Penrose <[email protected]> * HSDS (#211) Adds hindcast tests back into the test suite. The NREL HSDS API issues were resolved by creating multiple calls to the API for direction wave spectrum requests. Additionally, an exponential back-off time was implemented to retry calls with an increased wait time between calls. Co-authored-by: Adam Keester <[email protected]> * Provide function to convert from Te to Tp using ITTC approximation (#210) * Provide function to convert from Te to Tp using ITTC approximation * Apply suggestions from code review Co-authored-by: Adam Keester <[email protected]> * Updates * Force float32 datatype * added downsampelind comparison and tried contourf * D3D tanana data * tanana transect 2 * tanana transect 3 * Docstring formatting * Metocean module - WIND Toolkit (#187) * initial script * update wind_toolkit with 4 regions and 1-hr or 5-min data * update parameters of wind_toolkit functions * compare NDBC and WIND metocean data * fix typo in wpto hindcast example * finish metocean example and add results * add wind_toolkit to wave/io/__init__.py * update WIND Toolkit parameter list * initial test structure for WIND toolkit * finish metocean example * add function to plot each region * wind toolkit tests and test data * add tests for misc wind_toolkit MHKiT functions and cases * fix wind toolkit tests * add elevation_to_string utility function * misc cleanup * clarify available parameters * add users lat_lon to plot_region visualization * update example with new functions * add numpy dependency back in * Ingnore the new hindcast folder * Include only the new hindcast folder * Move hindcast tests to hindcast folder * Specify exclusion of hindcast from standard coverage * update hindcast coverage * remove unnecessary header * move hindcast and wind_toolkit to wave/io/hindcast * update .coveragerc files * update paths for new wave.io.hindcast directory Co-authored-by: ssolson <[email protected]> * Change 'default' docstring default * Remove old comments * updated code to match Energies paper * Review * Boat transect image * updated variable names * Dolfyn updates (#212) * RDI reader, logging, duty cycle motion correction * Updates * Force float32 datatype * Docstring formatting * Change 'default' docstring default * Remove old comments * updated variable names * updated variable names added to discriptions * Clean up and suggestions * added to the examples * TRTS study edits * code and discription updates * Edits and TODOs * moved files, updated discriptions * readding Delft3D_example notebook * added USGS discharge * updated doc strings * example updates and move data files * updated doc strings and Error equations * updated doc strings * pulled down development branch * updated figure visibility * updated figure at L2 equation * restor old version * updated L2 eqation and intro fig * updated L2 eqation and intro fig * updated L2 equation * pulled in Develope branch * updated figure formate --------- Co-authored-by: ssolson <[email protected]> Co-authored-by: ssolson <[email protected]> Co-authored-by: Carlos A. Michelén Ströfer <[email protected]> Co-authored-by: rpauly18 <[email protected]> Co-authored-by: hivanov-nrel <[email protected]> Co-authored-by: jmcvey3 <[email protected]> Co-authored-by: jmcvey3 <[email protected]> Co-authored-by: jmcvey3 <[email protected]> Co-authored-by: rpauly18 <[email protected]> Co-authored-by: Adam Keester <[email protected]> Co-authored-by: Browning <[email protected]> Co-authored-by: Mark Bruggemann <[email protected]> Co-authored-by: Graham Penrose <[email protected]>

Browning added 3 commits April 7, 2022 15:04

fixing file history

09389b3

fixing file history

bfa5c31

fixing file history

e703487

browniea requested a review from ssolson April 7, 2022 22:49

ssolson mentioned this pull request Apr 11, 2022

Delft 3D Timestep to Seconds Function #155

Closed

ssolson changed the title ~~Delft 3D Timestep to Seconds Function version 2~~ Delft 3D Timestep to Seconds Function Apr 11, 2022

ssolson reviewed Apr 11, 2022

View reviewed changes

Browning added 6 commits April 13, 2022 19:38

made revisions from ssolson review

b2a8959

changed time_stamp to timestamp

a63b9a5

updated varible names

fcb449a

updated variable names

eaab399

fixed syntax line 63

c4f1bc1

umdated variable name

4c8ab3b

ssolson reviewed Apr 21, 2022

View reviewed changes

fixed typos in doc strings

ddb1f69

ssolson reviewed May 26, 2022

View reviewed changes

ssolson review 5-26-2022

623d0b3

ssolson reviewed May 31, 2022

View reviewed changes

mhkit/river/io/d3d.py Outdated Show resolved Hide resolved

mhkit/river/io/d3d.py Outdated Show resolved Hide resolved

ssolson reviewed Jun 9, 2022

View reviewed changes

Browning added 3 commits June 13, 2022 19:43

deleted excessive code in get_all_data

a1b4943

chaged TI to a % from a fraction

880a0f9

adjusted TI test to be a %

291fafc

ssolson reviewed Jun 14, 2022

View reviewed changes

mhkit/river/io/d3d.py Outdated Show resolved Hide resolved

ssolson reviewed Jun 14, 2022

View reviewed changes

mhkit/river/io/d3d.py Outdated Show resolved Hide resolved

ssolson reviewed Jun 14, 2022

View reviewed changes

mhkit/river/io/d3d.py Show resolved Hide resolved

ssolson reviewed Jun 14, 2022

View reviewed changes

Browning and others added 2 commits June 15, 2022 18:14

fixed doc string for TI function

fe2c615

Docstring adjustments

89ccb3f

ssolson reviewed Jun 21, 2022

View reviewed changes

browniea and others added 2 commits June 21, 2022 12:36

Merge pull request #1 from ssolson/d3d_2

b2a34a3

Docstring adjustments

updated doc strings

9842fc4

ssolson changed the base branch from master to Develop July 20, 2022 14:09

ssolson added enhancement New feature or request river module tidal module labels Jul 20, 2022

ssolson and others added 17 commits July 20, 2022 08:40

Make convert_time a hidden func, make 2 functions to access it

54028df

Minor changes to get_lay_data docstring and formatting

1b487de

small changes

eaac4d7

merge changes

4f1fc6b

remove print from create_points

43743c2

example notebook clean up

9c46817

Merge pull request #2 from ssolson/d3d_2

af4eaeb

Convert time to 2 wrapper function

Merge branch 'master' of https://github.com/MHKiT-Software/MHKiT-Python…

826a536

… into d3d_2

fixing merge conflicts

43ef852

fixed merge confilics

0edfe1c

updated after merge

4a2c942

final developmet barnach merge updates

37283ec

deleated space

3582eb2

Delete test_river.py

8d39f13

added coverage to test

450180c

Merge branch 'd3d_2' of https://github.com/browniea/MHKiT-Python into…

f2f4ea7

… d3d_2

updated min and max plot labels

0bfcf30

ssolson merged commit d889f3b into MHKiT-Software:Develop Aug 10, 2022

ssolson mentioned this pull request Feb 10, 2023

MHKiT v0.6.0 #222

Merged

rpauly18 mentioned this pull request Jan 26, 2024

Matlab Parity with Python MHKiT-Software/MHKiT-MATLAB#110

Open

simmsa mentioned this pull request Feb 2, 2024

Add Delft3D Module MHKiT-Software/MHKiT-MATLAB#124

Merged

14 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Delft 3D Timestep to Seconds Function #168

Delft 3D Timestep to Seconds Function #168

browniea commented Apr 7, 2022 •

edited by ssolson

Loading

ssolson left a comment

ssolson left a comment

ssolson left a comment

browniea commented Jun 9, 2022

ssolson Jun 9, 2022

ssolson Jun 9, 2022

ssolson Jun 9, 2022

ssolson Jun 21, 2022

ssolson left a comment

ssolson left a comment

ssolson Jun 21, 2022

ssolson Jun 21, 2022

ssolson Jun 21, 2022

browniea Jun 22, 2022

ssolson Jun 21, 2022

browniea Jun 22, 2022

ssolson Jun 21, 2022

		A positive integer to pull the time index from the dataset. 0 being closest
		to time 0. Default is last time index -1.

Delft 3D Timestep to Seconds Function #168

Delft 3D Timestep to Seconds Function #168

Conversation

browniea commented Apr 7, 2022 • edited by ssolson Loading

ssolson left a comment

Choose a reason for hiding this comment

ssolson left a comment

Choose a reason for hiding this comment

ssolson left a comment

Choose a reason for hiding this comment

browniea commented Jun 9, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ssolson left a comment

Choose a reason for hiding this comment

ssolson left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

browniea commented Apr 7, 2022 •

edited by ssolson

Loading