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 e8721cb1 authored by Pierre Cazenave's avatar Pierre Cazenave

Merge branch 'master' of gitlab.ecosystem-modelling.pml.ac.uk:pica/fvcom-examples

parents 5759863c 8eac4bf1
...@@ -162,6 +162,7 @@ if strcmpi(inputConf.surface_heat, 'NCEP') ...@@ -162,6 +162,7 @@ if strcmpi(inputConf.surface_heat, 'NCEP')
% - Air temperature (air) [celsius] % - Air temperature (air) [celsius]
% - Relative humidity (rhum) [%] % - Relative humidity (rhum) [%]
% - Sea level pressure (pres) [Pa] % - Sea level pressure (pres) [Pa]
% - Wind (u and v) (uwnd, vwnd) [ms^{-1}]
% %
% The script converts the NCEP data from the OPeNDAP server from % The script converts the NCEP data from the OPeNDAP server from
% longitudes in the 0 to 360 range to the -180 to 180 range. It % longitudes in the 0 to 360 range to the -180 to 180 range. It
...@@ -169,7 +170,7 @@ if strcmpi(inputConf.surface_heat, 'NCEP') ...@@ -169,7 +170,7 @@ if strcmpi(inputConf.surface_heat, 'NCEP')
% Mobj.lat). % Mobj.lat).
heating = get_NCEP_forcing(Mobj, ... heating = get_NCEP_forcing(Mobj, ...
[inputConf.startDateMJD, inputConf.endDateMJD], ... [inputConf.startDateMJD, inputConf.endDateMJD], ...
'varlist', {'dlwrf', 'dswrf', 'air', 'rhum', 'pres'}); 'varlist', {'dlwrf', 'dswrf', 'air', 'rhum', 'pres', 'uwnd', 'vwnd'});
heating.domain_cols = length(heating.lon); heating.domain_cols = length(heating.lon);
heating.domain_rows = length(heating.lat); heating.domain_rows = length(heating.lat);
...@@ -286,7 +287,7 @@ if strcmpi(inputConf.surface_heat, 'NCEP') ...@@ -286,7 +287,7 @@ if strcmpi(inputConf.surface_heat, 'NCEP')
end end
% Interpolate rhum, pres and longwave radiation to hourly values. % Interpolate rhum, pres and longwave radiation to hourly values.
todo = {'rhum', 'pres', 'dlwrf', 'air'}; todo = {'rhum', 'pres', 'dlwrf', 'air', 'uwnd', 'vwnd'};
for ff = 1:length(todo) for ff = 1:length(todo)
% Force the data onto the 'global' position arrays. This fixes % Force the data onto the 'global' position arrays. This fixes
% problems with grid2fvcom and the relative humidity grid in % problems with grid2fvcom and the relative humidity grid in
...@@ -334,6 +335,7 @@ if strcmpi(inputConf.surface_heat, 'NCEP') ...@@ -334,6 +335,7 @@ if strcmpi(inputConf.surface_heat, 'NCEP')
% [1, 1, size(heating.nshf.data, 3)])) = nan; % [1, 1, size(heating.nshf.data, 3)])) = nan;
interpfields = {'dswrf', 'dlwrf', 'pres', 'air', 'rhum', ... interpfields = {'dswrf', 'dlwrf', 'pres', 'air', 'rhum', ...
'uwnd', 'vwnd', ...
'time', 'lon', 'lat', 'x', 'y'}; 'time', 'lon', 'lat', 'x', 'y'};
heating_interp = grid2fvcom(Mobj, interpfields, heating); heating_interp = grid2fvcom(Mobj, interpfields, heating);
if ftbverbose if ftbverbose
......
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