Merge pull request #97 from CHLNDDEV/Small_addition

Small changes
CHLNDDEV · Jul 27, 2020 · e692c49 · e692c49
2 parents a253b92 + 52e71d2
commit e692c49
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/@msh/private/GridData.m b/@msh/private/GridData.m
@@ -349,7 +349,7 @@
             if sum(isnan(b)) > 0
                 localcoord = obj.p(K,:);
                 KI = knnsearch(localcoord(~isnan(b),:),localcoord(isnan(b),:));
-                bb = b(~isnan(b),:);
+                bb = b(~isnan(b));
                 b(isnan(b)) = bb(KI); clear bb localcoord
             end
         end
@@ -370,13 +370,13 @@
             if ~isempty(find(isnan(bx),1))
                 localcoord = obj.p(K,:);
                 KI = knnsearch(localcoord(~isnan(bx),:),localcoord(isnan(bx),:));
-                bb = bx(~isnan(bx),:);
+                bb = bx(~isnan(bx));
                 bx(isnan(bx)) = bb(KI); clear bb localcoord
             end
             if ~isempty(find(isnan(by),1))
                 localcoord = obj.p(K,:);
                 KI = knnsearch(localcoord(~isnan(by),:),localcoord(isnan(by),:));
-                bb = by(~isnan(by),:);
+                bb = by(~isnan(by));
                 by(isnan(by)) = bb(KI); clear bb localcoord
             end
         end

diff --git a/@msh/private/writefort15.m b/@msh/private/writefort15.m
@@ -98,7 +98,9 @@
 fprintf( fid, '%g   \t \t ! RNDY \n', f15dat.rndy ) ;
 
 % DRAMP
-fprintf( fid, '%d   \t \t ! DRAMP \n',  f15dat.dramp ) ;
+L = length(f15dat.dramp);
+dfmt = repmat('%g ',1, L);
+fprintf( fid, [dfmt ' \t \t ! DRAMP \n'],  f15dat.dramp ) ;
 
 % A00, B00, C00
 fprintf( fid, '%g %g %g   \t  ! A00, B00, C00 \n', f15dat.a00b00c00 ) ; 

diff --git a/utilities/Calc_f13.m b/utilities/Calc_f13.m
@@ -13,6 +13,7 @@
 %              'Re' ('initial_river_elevation')
 %              'Ad' ('advection_state')
 %              'Sb' ('subgrid_barrier')
+%              'Es' ('elemental_slope_limiter')
 %
 %            3) then either: 
 %              'inpoly' followed by...
@@ -55,6 +56,9 @@
 elseif strcmpi(attribute,'Sb')
      attrname = 'subgrid_barrier';
      default_val = 99999;
+elseif strcmpi(attribute,'Es')
+     attrname = 'elemental_slope_limiter';
+     default_val = -1e-3;
 else
     error(['Attribute ' attribute ' not currently supported'])
 end