Skip to content

Conversation

@yman95
Copy link

@yman95 yman95 commented Jan 30, 2023

Hello,

I'm opening a pull request for my issue at #983. As mentioned in the issue, NEMOH 3.0 made a few changes to the format of Nemoh.cal, so a few tweaks are needed for readNEMOH.m:

From line 92-97:
92 if isempty(strfind(raw{n},'Number of wave frequencies'))==0
93 tmp = textscan(raw{n},'%f %f %f %f'); %added a new %f because of NEMOH3.0 Nemol.cal format change
94 hydro(F).Nf = tmp{2}; % Number of wave frequencies %changed from tmp{1} to tmp{2}
95 hydro(F).w = linspace(tmp{3},tmp{4},tmp{2}); % Wave frequencies %changed {2,3,1} to {3,4,2}
96 hydro(F).T = 2*pi./hydro(F).w; % Wave periods
97 end

At line 173
173 if isempty(strfind(raw{n},'Excitation force'))==0 %Changed from 'Diffraction' to 'Excitation'

kmruehl and others added 30 commits May 20, 2022 11:00
adding master and dev build status to README
This PR has the following files that introduce some new features,
1. The .mlapp file can be run to launch the app-builder and a GUI that can generate WEC-Sim Input Files. The app can also be installed and will appear under 'Apps' tab in MATLAB.  If installing the app, note, that the app files are stored in the MATLAB's Apps related data storage folder,

2. The wecsim_modelmaker.m can generate wec-sim models programmatically after an input file has been run. The code can generate bodies, ptos and constraints using the input file and the user can define the configuration of the wec-sim model. For instance, the user can define how the bodies ptos and constraints are connects whether in parallel such that all bodies are attached to the global frame or in series, such that some bodies are attached to other bodies using pto/constraint blocks while others are connected to the global frame.

Here the Postive signs to the ptoType and constraintType variables denote
parallel connections, such that the corresponding body is attached to the
global frame.
The Negative sign denotes that the body is connected to the body with
index one less than the current body.
ptoType variable defines the type of ptos such that,
1. Spherical PTO,
2. Translational PTO,
3. Translational PTO Actuation Force,
4. Translational PTO Actuation Motion,
5. Rotational PTO,
6. Rotational PTO Actuation Torque,
7. Rotational PTO Actuation Motion
constraintType varibables are defined as,
1. Fixed,
2. Spherical,
3. Translational,
4. Rotational,
5. Floating 3DOF,
6. FLoating 6DOF.

Note: The tranlational PTO ports are defined differently than all other
ptos and constraints. This code accounts for that at the end of PTO
for-loops.
* Move run('stopWecSim') to wecSim.m

* Update docs for running from Simulink
initial commit largeXYDispOption
* remove fixed mass option

* add fixed mass clarification in docs

* update fixed mass comment in input files

* minor doc revision

Co-authored-by: kmruehl <kmruehl@sandia.gov>
* Update README.md

adding dev and master build status to README

* adding v5.0 release notes

* Fix typo in docs. (#898)

* Update documentation tutorials to fix OSWEC inertia (#894)

* Update tutorials to fix OSWEC inertia

* Update terminology.rst

* Update tutorials.rst

changed OSWEC Iyy and added note

Co-authored-by: Kelley Ruehl <kmruehl@sandia.gov>

* CI: Split docs jobs | Add color to docs logs | Cancel runs on new push | Add 2021b to MATLAB versions (#862)

* Split docs CI into test and build jobs

This PR splits the docs CI workflow into two independent jobs. The
first "test" job checks the current branch with any warnings
triggering a failure. The second jobs builds and deploys the
production docs, allowing any warnings to pass. This allows the
commit author to see any new issues they may be adding to the docs
while not stopping the docs being published.

* Try to get color output in log

* Remove redundant steps for branch test

* Fix duplicate targets using anonymous references

* Cancel previous runs if new commits are made

* Fix spelling mistake to test concurrency

* Limit concurrency to pull requests for the unit tests

This is to ensure all commits on the master and dev branches are
tested, which will be important if we are going to measure
coverage using an external service like codecov.

* Fix another spelling mistake

* Add R2021b to explicit MATLAB versions tested

* resolve code struc table bug

* [Bug fix] Mac path fixes and make outputDir public (#874)

* Moved simulationClass.outputDir to public.

* Replaced paths with fullfile paths in CompareBEMIO.m. The paths didd not work on Mac due to file separator.

* Update line 38 in reaadAQWA.m so it works on a Mac.

* change filesep in BEMIO examples, update readAQWA fileparts

* Update stopWecSim.m

Replaced hardcoded 'output' string with simu.outputDir.

* Removed clc and close all from initializeWecSim.

It should be up to the user to clear the command windows and close the figures.

Co-authored-by: Lermart96 <anders.brandt@oceanharvesting.com>
Co-authored-by: akeeste <akeeste@sandia.gov>

* resolving doc language bug

* wecSimPCT Fix (Master) (#870)

* Update stopWecSim.m

* Update initializeWecSim.m

* Update wecSimPCT.m

* Fix image bug in PTO-Sim in Library Browser (#896)

Co-authored-by: Kelley Ruehl <kmruehl@sandia.gov>
Co-authored-by: Matthieu Ancellin <31126826+mancellin@users.noreply.github.com>
Co-authored-by: jtgrasb <87095491+jtgrasb@users.noreply.github.com>
Co-authored-by: Mathew Topper <damm_horse@yahoo.co.uk>
Co-authored-by: Ahmed Rashid <32479811+ahmedmetin@users.noreply.github.com>
Co-authored-by: Lermart96 <anders.brandt@oceanharvesting.com>
Co-authored-by: yuyihsiang <yyu@nycu.edu.tw>
Co-authored-by: Jorge Leon <72461917+jleonqu@users.noreply.github.com>
* Add files via upload

* Add files via upload
Updated coordinate system with the following features:
1. Add the mean water surface to the global system;
2. Add different view perspectives to help overall system understanding.
Fix wave elevation import with rampTime = 0
* Update simu, body, and wave classes

* Update constraintClass

* Add checks to body, constraint, mooring, pto, and ptoSim classes.

* Fix struct

* change string to char array

* Update structs

* Add checkInputs to check structs and format

* Update for MCR

* fix for application cases

* Update cicEndTime to be okay with empty values

* Update bodyClass.m

* Add solver and body.mass scalar check

Add solver check

* Update to restrict rather than convert variables

* Change char array back to string

* Move boolean checks to checkInputs to avoid documentation issues
* adding ampSpectraForWS for robust etaImport workflow

* adding docs

* adding docs

* p based on local elv

* p based on local elv

* remove source function and point users to MHKiT

* revert to Doms function and point users to WS source

Co-authored-by: akeeste <akeeste@sandia.gov>
* customizable dofs for plotBEMIO

* fixing for loop bugs, adding off diagonal terms, and naming function for off diags

* suppressed annoying output, fixed on label

* add body counter

Co-authored-by: dforbush2 <dforbus@sandia.gov>
* Calculation_of_Ainf_using_radiationIRF.m

This PR follows #880 and #938
If the added-mass infinity was missing from the BEM run, radiationIRF function calculates the Added-mass at infinity.
However, this only happens for non-WAMIT BEM codes.
This PR generates the added-mass at infinity, if it is missing from the BEM run regardless of the BEM code.

* check_normalizeBEM

* check_for_modified_readWAMIT

* only_change_radiationIRF
Co-authored-by: Sal <84348506+salhus@users.noreply.github.com>
akeeste and others added 14 commits October 12, 2022 09:40
* data_format_fixes

* read_in_string_dataType
included readCAPYTAINE() argument to explicitly define KH.dat & Hydro…
* extractmaskvar_func

* update_maske_extraction_function

* Documentation_for_ExtractMaskVariables()

* delimiter correction in documentation
* Add tests to check that the SLX file version do not exceed R2020b

* Move setting ErrorIfLoadNewModel to AddWecSimSource.m

* Only test simulink version numbers for files in the source directory

* Add `set_param(0, 'ErrorIfLoadNewModel', 'off')` to workflow

* Move `set_param` into testing step

* saving cable lib to 2020b

* added Simulink compatability param setting to initializeWecSim

Co-authored-by: kmruehl <kmruehl@sandia.gov>
Some files were introduced to the dev branch when I was updating my fork a while back. Removing the extra files and replacing the folder from the master branch.
@yman95 yman95 marked this pull request as draft January 30, 2023 19:06
@yman95 yman95 closed this Jan 30, 2023
Products of Inertia in WEC-Sim
@kmruehl
Copy link
Collaborator

kmruehl commented Feb 8, 2023

closing and re-opening as #990

@kmruehl kmruehl closed this Feb 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants