Due to a shift in policy, from 0900 GMT on Wednesday 14th July 2021, we will be disabling ssh access to the server for external users. External users who wish to continue to access code repositories on the server will need to switch to using https. This can be accomplished in the following way: 1) On the repo on gitlab, use the clone dialogue and select ‘Clone with HTTPS’ to get the address of the repo; 2) From within the checkout of your repo run: $ git remote set-url origin HTTPS_ADDRESS. Here, replace HTTPS_ADDRESS with the address you have just copied from GitLab. Pulls and pushes will now require you to enter a username and password rather than using a ssh key. If you would prefer not to enter a password each time, you might consider caching your login credentials.

Commit 7210097c authored by Pierre Cazenave's avatar Pierre Cazenave

Fix the way the u and v data are extracted from the model to use the

relevant element ID instead of the node ID.
parent 815a77eb
...@@ -21,8 +21,14 @@ function [Mobj] = add_stations_list(Mobj,Positions,Names,Dist) ...@@ -21,8 +21,14 @@ function [Mobj] = add_stations_list(Mobj,Positions,Names,Dist)
% ensure Dist is in those units. % ensure Dist is in those units.
% %
% OUTPUT: % OUTPUT:
% Mobj = Matlab mesh object with an additional cell array containing id, % Mobj = Matlab mesh object with an additional cell array (stations)
% x, y, nodelist, depth and station name. % containing:
% {id, x, y, nodelist, depth, 'station name', elem}
% where id is the station ID (from 1 number of valid stations, x and y
% are the coordinates of the station, nodelist is the indices of the
% model grid nodes, depth is the depth at the grid node, station name is
% a string of the name from the input file and eleme is the grid element
% ID closest to each station.
% %
% EXAMPLE USAGE % EXAMPLE USAGE
% Mobj = add_stations_list(Mobj, [-5.54, 50.103; -3.0865, 58.441], ... % Mobj = add_stations_list(Mobj, [-5.54, 50.103; -3.0865, 58.441], ...
...@@ -31,9 +37,11 @@ function [Mobj] = add_stations_list(Mobj,Positions,Names,Dist) ...@@ -31,9 +37,11 @@ function [Mobj] = add_stations_list(Mobj,Positions,Names,Dist)
% Author(s): % Author(s):
% Pierre Cazenave (Plymouth Marine Laboratory) % Pierre Cazenave (Plymouth Marine Laboratory)
% %
%
% Revision history % Revision history
% 2012-11-30 First version. % 2012-11-30 First version.
% 2015-01-14 Add support for exporting the element ID closest to the
% station of interest (as well as the node ID which was already there).
% Fix some formatting issues.
% %
%========================================================================== %==========================================================================
subname = 'add_stations_list'; subname = 'add_stations_list';
...@@ -74,10 +82,11 @@ else ...@@ -74,10 +82,11 @@ else
end end
inc = 1; inc = 1;
out = cell(nPos, 1); out = cell(1); % don't preallocate as we don't know how many we'll have
for s=1:nPos for s=1:nPos
[node, dist] = find_nearest_pt(Positions(s, cols(1)), Positions(s, cols(2)), Mobj); [node, dist] = find_nearest_pt(Positions(s, cols(1)), Positions(s, cols(2)), Mobj);
[~, elem] = min(abs(sqrt((Mobj.xc - Positions(s, cols(1))).^2 + Mobj.yc - Positions(s, cols(2))).^2));
if dist >= Dist if dist >= Dist
% Skip out for this station % Skip out for this station
...@@ -86,7 +95,7 @@ for s=1:nPos ...@@ -86,7 +95,7 @@ for s=1:nPos
end end
continue continue
end end
out{inc} = {inc, Positions(s, cols(1)), Positions(s, cols(2)), node, Mobj.h(node), Names{s}}; out{inc} = {inc, Positions(s, cols(1)), Positions(s, cols(2)), node, Mobj.h(node), Names{s}, elem};
inc = inc + 1; inc = inc + 1;
end end
......
...@@ -65,6 +65,10 @@ function write_FVCOM_probes(nml_file, interval, probes) ...@@ -65,6 +65,10 @@ function write_FVCOM_probes(nml_file, interval, probes)
% %
% Revision history: % Revision history:
% 2014-02-10 - First version. % 2014-02-10 - First version.
% 2015-01-14 - Fix export of the u and v locations to use the closest
% element instead of the node ID. Using the node ID for the u and v data
% will yield velocity time series miles away from the actual location of
% interest.
% %
%========================================================================== %==========================================================================
...@@ -103,7 +107,11 @@ for p = 1:np ...@@ -103,7 +107,11 @@ for p = 1:np
file = fullfile(pathstr, name); file = fullfile(pathstr, name);
fprintf(f, '&NML_PROBE\n'); fprintf(f, '&NML_PROBE\n');
fprintf(f, ' PROBE_INTERVAL = "seconds=%.1f",\n', interval); fprintf(f, ' PROBE_INTERVAL = "seconds=%.1f",\n', interval);
fprintf(f, ' PROBE_LOCATION = %i,\n', probes.(fnames{p}).node); if any(strcmpi(vname, {'u', 'v'}))
fprintf(f, ' PROBE_LOCATION = %i,\n', probes.(fnames{p}).elem);
else
fprintf(f, ' PROBE_LOCATION = %i,\n', probes.(fnames{p}).node);
end
fprintf(f, ' PROBE_TITLE = "%s",\n', file); fprintf(f, ' PROBE_TITLE = "%s",\n', file);
% If we've got something which is vertically resolved, output the % If we've got something which is vertically resolved, output the
% vertical levels. % vertical levels.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment