Changeset 24686 for issm/trunk/src/m/plot/plot_basaldrag.m

Timestamp:

04/01/20 21:54:40 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24684

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/plot/plot_basaldrag.m (modified) (2 diffs)

issm/trunk/src/m/plot/plot_basaldrag.m

@@ -20 +20 @@
 r=averaging(md,md.friction.q./md.friction.p,0);
 
-%compute horizontal velocity
+ub_mag=sqrt(md.initialization.vx.^2+md.initialization.vy.^2)/md.constants.yts;
+drag_mag=(max(md.constants.g*(md.materials.rho_ice*md.geometry.thickness+md.materials.rho_water*md.geometry.base),0)).^r.*(md.friction.coefficient).^2.*ub_mag.^s/1000;
+sig=1;
+
+%compute horizontal velocity 
 if strcmpi(type,'basal_drag')
         ub=sqrt(md.initialization.vx.^2+md.initialization.vy.^2)/md.constants.yts;
+        title_str='Basal drag [kPa]';
 elseif strcmpi(type,'basal_dragx')
         ub=md.initialization.vx/md.constants.yts;
+        sig=-1;
+        title_str='Basal drag - x direction [kPa]';
 elseif strcmpi(type,'basal_dragy')
         ub=md.initialization.vy/md.constants.yts;
+        sig=-1;
+        title_str='Basal drag - y direction [kPa]';
 end
 
 %compute basal drag
-drag=(max(md.constants.g*(md.materials.rho_ice*md.geometry.thickness+md.materials.rho_water*md.geometry.base),0)).^r.*(md.friction.coefficient).^2.*ub.^s/1000;
+drag=sig*drag_mag.*ub./ub_mag;
 
 %Figure out if this is a Section plot
@@ -47 +56 @@
 
         %apply options
-        options=addfielddefault(options,'title','Basal drag [kPa]');
+        options=addfielddefault(options,'title',title_str);     
         options=addfielddefault(options,'view',2);
         applyoptions(md,basal_drag,options);