Merge pull request #60 from CHLNDDEV/dev-testing

improving help lines and adding a catch line in NLDC mannings
CHLNDDEV · Mar 12, 2020 · 79727f7 · 79727f7
2 parents 1255184 + b782ad9
commit 79727f7
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 3 deletions.
diff --git a/@edgefx/edgefx.m b/@edgefx/edgefx.m
@@ -1,11 +1,30 @@
-
 classdef edgefx
     %   EDGEFX: Edgefunction class
     %   Constructs edgefunctions that are based on numerous geomteric and
     %   topographic criteria that guide the spatially variability of elemental
     %   resolution when building a mesh.
     %   Copyright (C) 2018  Keith Roberts & William Pringle
     %
+    %   The following properties (with default values) are available for input
+    %   to the edgefx method: 
+    %      defval = 0; % placeholder value if arg is not passed.
+    %      addOptional(p,'dis',defval);
+    %      addOptional(p,'fs',defval);
+    %      addOptional(p,'wl',defval);
+    %      addOptional(p,'slp',defval);
+    %      addOptional(p,'ch',defval);
+    %      addOptional(p,'min_el_ch',100);
+    %      addOptional(p,'AngOfRe',60);
+    %      addOptional(p,'max_el',inf);
+    %      addOptional(p,'max_el_ns',inf);
+    %      addOptional(p,'g',0.20);
+    %      addOptional(p,'geodata',defval)
+    %      addOptional(p,'lmsl',defval)
+    %      addOptional(p,'dt',-1);
+    %      addOptional(p,'fl',defval);
+    %      addOptional(p,'Channels',defval);
+    %      addOptional(p,'h0',defval);
+    %
     %   This program is free software: you can redistribute it and/or modify
     %   it under the terms of the GNU General Public License as published by
     %   the Free Software Foundation, either version 3 of the License, or

diff --git a/@geodata/geodata.m b/@geodata/geodata.m
@@ -4,6 +4,20 @@
     %   the form of a shapefile and topobathy in the form of a DEM
     %   Copyright (C) 2018  Keith Roberts & William Pringle
     %
+    %   The following inputs (with default values) are available for the
+    %   geodata method:
+    %     defval = 0; % placeholder value if arg is not passed.
+    %     addOptional(p,'bbox',defval);
+    %     addOptional(p,'shp',defval);
+    %     addOptional(p,'h0',defval);
+    %     addOptional(p,'dem',defval);
+    %     addOptional(p,'backupdem',defval);
+    %     addOptional(p,'fp',defval);
+    %     addOptional(p,'weirs',defval);
+    %     addOptional(p,'pslg',defval);
+    %     addOptional(p,'boubox',defval);
+    %     addOptional(p,'window',defval);
+    %
     %   This program is free software: you can redistribute it and/or modify
     %   it under the terms of the GNU General Public License as published by
     %   the Free Software Foundation, either version 3 of the License, or

diff --git a/@msh/msh.m b/@msh/msh.m
@@ -200,7 +200,8 @@ function write(obj,fname,type)
             %    f) 'slp'  - plots the bathymetric gradients
             %    g) 'itfric' - plots the internal_tide_friction values
             %    h) 'cfvals' - plots the quadratic bottom friction values
-            %    i) 'xx' -     plots an arbitrary f13 attribute 'xx' by
+            %    i) 'mann'   - plots the manning's n values
+            %    j) 'xx' -     plots an arbitrary f13 attribute 'xx' by
             %                  contains search
             %    additional -->
             %    i)  add 'log' inside type to plot caxis in log space

diff --git a/utilities/Calc_NLCD_Mannings.m b/utilities/Calc_NLCD_Mannings.m
@@ -47,7 +47,7 @@
 dmy = msh();  dmy.p = obj.p; dmy.t = obj.t; 
 % Get NCLD values on dummy msh object using nearest neighbour
 obj1 = interp(dmy,NLCD,'interp','nearest','type','depth');
-obj1.b(isnan(obj1.b),:)=11; % <--default value to NaN 
+obj1.b(isnan(obj1.b) | obj1.b == 0,:)=11; % <--default value to NaN 
 % Convert to Mannings
 Man = nlcd_class(abs(obj1.b));