Index: /issm/trunk/test/Par/79North.par =================================================================== --- /issm/trunk/test/Par/79North.par (revision 8304) +++ /issm/trunk/test/Par/79North.par (revision 8305) @@ -11,5 +11,5 @@ %Materials -md.observed_temperature=(273-20)*ones(md.numberofgrids,1); +md.observed_temperature=(273-20)*ones(md.numberofnodes,1); md.rheology_B=paterson(md.observed_temperature); md.rheology_n=3*ones(md.numberofelements,1); @@ -18,5 +18,5 @@ pos=find(md.elementoniceshelf); md.drag_type=2; -md.drag_coefficient=50*ones(md.numberofgrids,1); +md.drag_coefficient=50*ones(md.numberofnodes,1); md.drag_coefficient(md.elements(pos,:))=0; md.drag_p=ones(md.numberofelements,1); @@ -24,9 +24,9 @@ %Ice shelf melting and accumulation -md.melting_rate=zeros(md.numberofgrids,1); -pos=zeros(md.numberofgrids,1); +md.melting_rate=zeros(md.numberofnodes,1); +pos=zeros(md.numberofnodes,1); pos(md.elements(find(md.elementoniceshelf),:))=1; md.melting_rate(find(pos))=10; -md.accumulation_rate=15*ones(md.numberofgrids,1); +md.accumulation_rate=15*ones(md.numberofnodes,1); %Numerical parameters Index: /issm/trunk/test/Par/ISMIPA.par =================================================================== --- /issm/trunk/test/Par/ISMIPA.par (revision 8304) +++ /issm/trunk/test/Par/ISMIPA.par (revision 8305) @@ -5,9 +5,9 @@ md.bed=md.surface-1000+500*sin(md.x*2*pi/max(md.x)).*sin(md.y*2*pi/max(md.x)); md.thickness=md.surface-md.bed; -md.firn_layer=0*ones(md.numberofgrids,1); +md.firn_layer=0*ones(md.numberofnodes,1); disp(' creating drag'); md.drag_type=2; %0 none 1 plastic 2 viscous -md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1. +md.drag_coefficient=200*ones(md.numberofnodes,1); %q=1. %Take care of iceshelves: no basal drag pos=find(md.elementoniceshelf); @@ -17,5 +17,5 @@ disp(' creating flow law paramter'); -md.rheology_B=6.8067*10^7*ones(md.numberofgrids,1); +md.rheology_B=6.8067*10^7*ones(md.numberofnodes,1); md.rheology_n=3*ones(md.numberofelements,1); Index: /issm/trunk/test/Par/ISMIPB.par =================================================================== --- /issm/trunk/test/Par/ISMIPB.par (revision 8304) +++ /issm/trunk/test/Par/ISMIPB.par (revision 8305) @@ -5,9 +5,9 @@ md.bed=md.surface-1000+500*sin(md.x*2*pi/max(md.x)); md.thickness=md.surface-md.bed; -md.firn_layer=0*ones(md.numberofgrids,1); +md.firn_layer=0*ones(md.numberofnodes,1); disp(' creating drag'); md.drag_type=2; %0 none 1 plastic 2 viscous -md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1. +md.drag_coefficient=200*ones(md.numberofnodes,1); %q=1. %Take care of iceshelves: no basal drag pos=find(md.elementoniceshelf); @@ -17,5 +17,5 @@ disp(' creating flow law paramter'); -md.rheology_B=6.8067*10^7*ones(md.numberofgrids,1); +md.rheology_B=6.8067*10^7*ones(md.numberofnodes,1); md.rheology_n=3*ones(md.numberofelements,1); Index: /issm/trunk/test/Par/ISMIPC.par =================================================================== --- /issm/trunk/test/Par/ISMIPC.par (revision 8304) +++ /issm/trunk/test/Par/ISMIPC.par (revision 8305) @@ -5,5 +5,5 @@ md.bed=md.surface-1000; md.thickness=md.surface-md.bed; -md.firn_layer=0*ones(md.numberofgrids,1); +md.firn_layer=0*ones(md.numberofnodes,1); disp(' creating drag'); @@ -18,5 +18,5 @@ disp(' creating flow law paramter'); -md.rheology_B=6.8067*10^7*ones(md.numberofgrids,1); +md.rheology_B=6.8067*10^7*ones(md.numberofnodes,1); md.rheology_n=3*ones(md.numberofelements,1); Index: /issm/trunk/test/Par/ISMIPD.par =================================================================== --- /issm/trunk/test/Par/ISMIPD.par (revision 8304) +++ /issm/trunk/test/Par/ISMIPD.par (revision 8305) @@ -5,5 +5,5 @@ md.bed=md.surface-1000; md.thickness=md.surface-md.bed; -md.firn_layer=0*ones(md.numberofgrids,1); +md.firn_layer=0*ones(md.numberofnodes,1); disp(' creating drag'); @@ -17,5 +17,5 @@ disp(' creating flow law paramter'); -md.rheology_B=6.8067*10^7*ones(md.numberofgrids,1); +md.rheology_B=6.8067*10^7*ones(md.numberofnodes,1); md.rheology_n=3*ones(md.numberofelements,1); Index: /issm/trunk/test/Par/ISMIPE.par =================================================================== --- /issm/trunk/test/Par/ISMIPE.par (revision 8304) +++ /issm/trunk/test/Par/ISMIPE.par (revision 8305) @@ -4,7 +4,7 @@ data=load('../Data/ISMIPE.data','-mat'); data=data.data; -md.surface=zeros(md.numberofgrids,1); -md.bed=zeros(md.numberofgrids,1); -for i=1:md.numberofgrids +md.surface=zeros(md.numberofnodes,1); +md.bed=zeros(md.numberofnodes,1); +for i=1:md.numberofnodes y=md.y(i); point1=floor(y/100)+1; @@ -15,5 +15,5 @@ end md.thickness=md.surface-md.bed; -md.firn_layer=0*ones(md.numberofgrids,1); +md.firn_layer=0*ones(md.numberofnodes,1); md.thickness(find(~md.thickness))=0.01; md.bed=md.surface-md.thickness; @@ -21,10 +21,10 @@ disp(' creating drag'); md.drag_type=2; %0 none 1 plastic 2 viscous -md.drag_coefficient=zeros(md.numberofgrids,1); +md.drag_coefficient=zeros(md.numberofnodes,1); md.drag_p=ones(md.numberofelements,1); md.drag_q=ones(md.numberofelements,1); disp(' creating flow law paramter'); -md.rheology_B=6.8067*10^7*ones(md.numberofgrids,1); +md.rheology_B=6.8067*10^7*ones(md.numberofnodes,1); md.rheology_n=3*ones(md.numberofelements,1); Index: /issm/trunk/test/Par/ISMIPF.par =================================================================== --- /issm/trunk/test/Par/ISMIPF.par (revision 8304) +++ /issm/trunk/test/Par/ISMIPF.par (revision 8305) @@ -7,14 +7,14 @@ md.bed=md.surface-1000+100*exp(-((md.x-max(md.x)/2).^2+(md.y-max(md.y)/2).^2)/(10000^2)); md.thickness=md.surface-md.bed; -md.firn_layer=0*ones(md.numberofgrids,1); +md.firn_layer=0*ones(md.numberofnodes,1); disp(' creating drag'); md.drag_type=2; %0 none 1 plastic 2 viscous -md.drag_coefficient=sqrt(md.yts/(2.140373*10^-7*1000))*ones(md.numberofgrids,1); +md.drag_coefficient=sqrt(md.yts/(2.140373*10^-7*1000))*ones(md.numberofnodes,1); md.drag_p=ones(md.numberofelements,1); md.drag_q=zeros(md.numberofelements,1); disp(' creating flow law paramter'); -md.rheology_B=1.4734*10^14*ones(md.numberofgrids,1); +md.rheology_B=1.4734*10^14*ones(md.numberofnodes,1); md.rheology_n=1*ones(md.numberofelements,1); md.rheology_law=NoneEnum; @@ -23,16 +23,16 @@ %Create grid on boundary fist (because we cannot use mesh) md=SetIceSheetBC(md); -md.spcvelocity(:,4)=100*ones(md.numberofgrids,1); -md.vx=zeros(md.numberofgrids,1); -md.vy=zeros(md.numberofgrids,1); -md.vz=zeros(md.numberofgrids,1); -md.vel=zeros(md.numberofgrids,1); -md.pressure=zeros(md.numberofgrids,1); -md.temperature=255*ones(md.numberofgrids,1); +md.spcvelocity(:,4)=100*ones(md.numberofnodes,1); +md.vx=zeros(md.numberofnodes,1); +md.vy=zeros(md.numberofnodes,1); +md.vz=zeros(md.numberofnodes,1); +md.vel=zeros(md.numberofnodes,1); +md.pressure=zeros(md.numberofnodes,1); +md.temperature=255*ones(md.numberofnodes,1); pos=find(md.x==min(md.x) | md.x==max(md.x) | md.y==min(md.y) | md.y==max(md.y)); md.spcthickness(pos,1)=1; md.spcthickness(pos,2)=md.thickness(pos); -md.spctemperature=[ones(md.numberofgrids,1) 255*ones(md.numberofgrids,1)]; -md.geothermalflux=0.4*ones(md.numberofgrids,1); +md.spctemperature=[ones(md.numberofnodes,1) 255*ones(md.numberofnodes,1)]; +md.geothermalflux=0.4*ones(md.numberofnodes,1); %Parallel options Index: /issm/trunk/test/Par/Pig.par =================================================================== --- /issm/trunk/test/Par/Pig.par (revision 8304) +++ /issm/trunk/test/Par/Pig.par (revision 8305) @@ -11,9 +11,9 @@ md.vx=md.vx_obs; md.vy=md.vy_obs; -md.vz=zeros(md.numberofgrids,1); -md.pressure=zeros(md.numberofgrids,1); +md.vz=zeros(md.numberofnodes,1); +md.pressure=zeros(md.numberofnodes,1); %Materials -md.observed_temperature=(273-20)*ones(md.numberofgrids,1); +md.observed_temperature=(273-20)*ones(md.numberofnodes,1); md.rheology_B=paterson(md.observed_temperature); md.rheology_n=3*ones(md.numberofelements,1); @@ -23,5 +23,5 @@ pos=find(md.elementoniceshelf); md.drag_type=2; -md.drag_coefficient=50*ones(md.numberofgrids,1); +md.drag_coefficient=50*ones(md.numberofnodes,1); md.drag_coefficient(md.elements(pos,:))=0; md.drag_p=ones(md.numberofelements,1); Index: /issm/trunk/test/Par/RoundSheetEISMINT.par =================================================================== --- /issm/trunk/test/Par/RoundSheetEISMINT.par (revision 8304) +++ /issm/trunk/test/Par/RoundSheetEISMINT.par (revision 8305) @@ -1,11 +1,11 @@ %Ok, start defining model parameters here disp(' creating thickness'); -md.thickness=10*ones(md.numberofgrids,1); -md.bed=zeros(md.numberofgrids,1); +md.thickness=10*ones(md.numberofnodes,1); +md.bed=zeros(md.numberofnodes,1); md.surface=md.bed+md.thickness; disp(' creating drag'); md.drag_type=2; %0 none 1 plastic 2 viscous -md.drag_coefficient=20*ones(md.numberofgrids,1); %q=1. %no drag is specified in the analytical solution +md.drag_coefficient=20*ones(md.numberofnodes,1); %q=1. %no drag is specified in the analytical solution md.drag_p=ones(md.numberofelements,1); md.drag_q=ones(md.numberofelements,1); @@ -17,8 +17,8 @@ md.observed_temperature=(tmin+st*radius); md.temperature=md.observed_temperature; -md.geothermalflux=4.2*10^-2*ones(md.numberofgrids,1); +md.geothermalflux=4.2*10^-2*ones(md.numberofnodes,1); disp(' creating flow law paramter'); -md.rheology_B=6.81*10^(7)*ones(md.numberofgrids,1); %to have the same B as the analytical solution +md.rheology_B=6.81*10^(7)*ones(md.numberofnodes,1); %to have the same B as the analytical solution md.rheology_n=3*ones(md.numberofelements,1); @@ -34,8 +34,8 @@ md.vy_obs=constant/2*md.y.*(md.thickness).^-1; md.vel_obs=(sqrt((md.vx_obs).^2+(md.vy_obs).^2)); -md.vx=zeros(md.numberofgrids,1); -md.vy=zeros(md.numberofgrids,1); -md.vz=zeros(md.numberofgrids,1); -md.pressure=zeros(md.numberofgrids,1); +md.vx=zeros(md.numberofnodes,1); +md.vy=zeros(md.numberofnodes,1); +md.vz=zeros(md.numberofnodes,1); +md.pressure=zeros(md.numberofnodes,1); %Deal with boundary conditions: Index: /issm/trunk/test/Par/RoundSheetShelf.par =================================================================== --- /issm/trunk/test/Par/RoundSheetShelf.par (revision 8304) +++ /issm/trunk/test/Par/RoundSheetShelf.par (revision 8305) @@ -34,11 +34,11 @@ %Initial velocity -md.vx=zeros(md.numberofgrids,1); -md.vy=zeros(md.numberofgrids,1); -md.vz=zeros(md.numberofgrids,1); -md.pressure=zeros(md.numberofgrids,1); +md.vx=zeros(md.numberofnodes,1); +md.vy=zeros(md.numberofnodes,1); +md.vz=zeros(md.numberofnodes,1); +md.pressure=zeros(md.numberofnodes,1); %Materials -md.observed_temperature=(273-20)*ones(md.numberofgrids,1); +md.observed_temperature=(273-20)*ones(md.numberofnodes,1); md.rheology_B=paterson(md.observed_temperature); md.rheology_n=3*ones(md.numberofelements,1); @@ -46,6 +46,6 @@ %Accumulation and melting -md.accumulation_rate=-10*ones(md.numberofgrids,1); -md.melting_rate=zeros(md.numberofgrids,1); +md.accumulation_rate=-10*ones(md.numberofnodes,1); +md.melting_rate=zeros(md.numberofnodes,1); pos=find(md.gridoniceshelf);md.melting_rate(pos)=10; @@ -53,5 +53,5 @@ pos=find(md.elementoniceshelf); md.drag_type=2; -md.drag_coefficient=20*ones(md.numberofgrids,1); +md.drag_coefficient=20*ones(md.numberofnodes,1); md.drag_coefficient(md.elements(pos,:))=0; md.drag_p=ones(md.numberofelements,1); @@ -75,5 +75,5 @@ %Deal with boundary conditions: -md.spcvelocity=zeros(md.numberofgrids,6); +md.spcvelocity=zeros(md.numberofnodes,6); pos=find(md.x==0 & md.y==0); md.spcvelocity(pos,1:2)=1; @@ -81,6 +81,6 @@ pressureload=[pressureload WaterEnum*md.elementoniceshelf(pressureload(:,end))+AirEnum*md.elementonicesheet(pressureload(:,end))]; md.pressureload=pressureload; -md.spcthickness=zeros(md.numberofgrids,2); -md.diagnostic_ref=NaN*ones(md.numberofgrids,6); +md.spcthickness=zeros(md.numberofnodes,2); +md.diagnostic_ref=NaN*ones(md.numberofnodes,6); %Change name so that no test have the same name Index: /issm/trunk/test/Par/RoundSheetStaticEISMINT.par =================================================================== --- /issm/trunk/test/Par/RoundSheetStaticEISMINT.par (revision 8304) +++ /issm/trunk/test/Par/RoundSheetStaticEISMINT.par (revision 8305) @@ -5,5 +5,5 @@ radiusmax=max(radius); md.thickness=hmin*ones(size(md.x,1),1)+hmax*(4*((1/2)^(4/3)*ones(size(md.x,1),1)-((radius)./(2*radiusmax)).^(4/3))).^(3/8); -md.firn_layer=10*ones(md.numberofgrids,1); +md.firn_layer=10*ones(md.numberofnodes,1); md.bed=0*md.thickness; md.surface=md.bed+md.thickness; @@ -11,5 +11,5 @@ disp(' creating drag'); md.drag_type=2; %0 none 1 plastic 2 viscous -md.drag_coefficient=20*ones(md.numberofgrids,1); %q=1. %no drag is specified in the analytical solution +md.drag_coefficient=20*ones(md.numberofnodes,1); %q=1. %no drag is specified in the analytical solution %Take care of iceshelves: no basal drag pos=find(md.elementoniceshelf); @@ -23,8 +23,8 @@ md.observed_temperature=(tmin+st*radius); md.temperature=md.observed_temperature; -md.geothermalflux=4.2*10^-2*ones(md.numberofgrids,1); +md.geothermalflux=4.2*10^-2*ones(md.numberofnodes,1); disp(' creating flow law paramter'); -md.rheology_B=6.81*10^(7)*ones(md.numberofgrids,1); %to have the same B as the analytical solution +md.rheology_B=6.81*10^(7)*ones(md.numberofnodes,1); %to have the same B as the analytical solution md.rheology_n=3*ones(md.numberofelements,1); @@ -40,8 +40,8 @@ md.vy_obs=constant/2*md.y.*(md.thickness).^-1; md.vel_obs=(sqrt((md.vx_obs).^2+(md.vy_obs).^2)); -md.vx=zeros(md.numberofgrids,1); -md.vy=zeros(md.numberofgrids,1); -md.vz=zeros(md.numberofgrids,1); -md.pressure=zeros(md.numberofgrids,1); +md.vx=zeros(md.numberofnodes,1); +md.vy=zeros(md.numberofnodes,1); +md.vz=zeros(md.numberofnodes,1); +md.pressure=zeros(md.numberofnodes,1); %Deal with boundary conditions: Index: /issm/trunk/test/Par/SquareEISMINT.par =================================================================== --- /issm/trunk/test/Par/SquareEISMINT.par (revision 8304) +++ /issm/trunk/test/Par/SquareEISMINT.par (revision 8305) @@ -4,6 +4,6 @@ ymin=min(md.y); ymax=max(md.y); -md.thickness=500*ones(md.numberofgrids,1); -md.firn_layer=0*ones(md.numberofgrids,1); +md.thickness=500*ones(md.numberofnodes,1); +md.firn_layer=0*ones(md.numberofnodes,1); md.bed=-md.rho_ice/md.rho_water*md.thickness; md.surface=md.bed+md.thickness; @@ -11,5 +11,5 @@ disp(' creating drag'); md.drag_type=2; %0 none 1 plastic 2 viscous -md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1. +md.drag_coefficient=200*ones(md.numberofnodes,1); %q=1. %Take care of iceshelves: no basal drag pos=find(md.elementoniceshelf); @@ -19,14 +19,14 @@ disp(' creating temperature'); -md.observed_temperature=(273-20)*ones(md.numberofgrids,1); +md.observed_temperature=(273-20)*ones(md.numberofnodes,1); disp(' creating flow law paramter'); %md.B=paterson(md.observed_temperature); -md.rheology_B=1.7687*10^8*ones(md.numberofgrids,1); +md.rheology_B=1.7687*10^8*ones(md.numberofnodes,1); md.rheology_n=3*ones(md.numberofelements,1); disp(' creating accumulation rates'); -md.accumulation_rate=0.2*ones(md.numberofgrids,1); %0m/a -md.melting_rate=0*ones(md.numberofgrids,1); %0m/a +md.accumulation_rate=0.2*ones(md.numberofnodes,1); %0m/a +md.melting_rate=0*ones(md.numberofnodes,1); %0m/a disp(' boundary conditions '); @@ -37,5 +37,5 @@ %Evolution of the ice shelf -pos=find(md.y==200000); %grids on the upper boundary condition +pos=find(md.y==200000); %nodes on the upper boundary condition md.spcthickness(pos,1)=1; md.spcthickness(pos,2)=500; Index: /issm/trunk/test/Par/SquareSheetConstrained.par =================================================================== --- /issm/trunk/test/Par/SquareSheetConstrained.par (revision 8304) +++ /issm/trunk/test/Par/SquareSheetConstrained.par (revision 8305) @@ -15,9 +15,9 @@ md.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y); clear vx vy x y index; -md.vz=zeros(md.numberofgrids,1); -md.pressure=zeros(md.numberofgrids,1); +md.vz=zeros(md.numberofnodes,1); +md.pressure=zeros(md.numberofnodes,1); %Materials -md.observed_temperature=(273-20)*ones(md.numberofgrids,1); +md.observed_temperature=(273-20)*ones(md.numberofnodes,1); md.rheology_B=paterson(md.observed_temperature); md.rheology_n=3*ones(md.numberofelements,1); @@ -27,5 +27,5 @@ pos=find(md.elementoniceshelf); md.drag_type=2; -md.drag_coefficient=20*ones(md.numberofgrids,1); +md.drag_coefficient=20*ones(md.numberofnodes,1); md.drag_coefficient(md.elements(pos,:))=0; md.drag_p=ones(md.numberofelements,1); Index: /issm/trunk/test/Par/SquareSheetShelf.par =================================================================== --- /issm/trunk/test/Par/SquareSheetShelf.par (revision 8304) +++ /issm/trunk/test/Par/SquareSheetShelf.par (revision 8305) @@ -18,9 +18,9 @@ md.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y); clear vx vy x y index; -md.vz=zeros(md.numberofgrids,1); -md.pressure=zeros(md.numberofgrids,1); +md.vz=zeros(md.numberofnodes,1); +md.pressure=zeros(md.numberofnodes,1); %Materials -md.observed_temperature=(273-20)*ones(md.numberofgrids,1); +md.observed_temperature=(273-20)*ones(md.numberofnodes,1); md.rheology_B=paterson(md.observed_temperature); md.rheology_n=3*ones(md.numberofelements,1); @@ -28,11 +28,11 @@ %Accumulation and melting -md.accumulation_rate=10*ones(md.numberofgrids,1); -md.melting_rate=5*ones(md.numberofgrids,1); +md.accumulation_rate=10*ones(md.numberofnodes,1); +md.melting_rate=5*ones(md.numberofnodes,1); %Friction pos=find(md.elementoniceshelf); md.drag_type=2; -md.drag_coefficient=20*ones(md.numberofgrids,1); +md.drag_coefficient=20*ones(md.numberofnodes,1); md.drag_coefficient(md.elements(pos,:))=0; md.drag_p=ones(md.numberofelements,1); Index: /issm/trunk/test/Par/SquareShelf.par =================================================================== --- /issm/trunk/test/Par/SquareShelf.par (revision 8304) +++ /issm/trunk/test/Par/SquareShelf.par (revision 8305) @@ -15,9 +15,9 @@ md.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y); clear vx vy x y index; -md.vz=zeros(md.numberofgrids,1); -md.pressure=zeros(md.numberofgrids,1); +md.vz=zeros(md.numberofnodes,1); +md.pressure=zeros(md.numberofnodes,1); %Materials -md.observed_temperature=(273-20)*ones(md.numberofgrids,1); +md.observed_temperature=(273-20)*ones(md.numberofnodes,1); md.rheology_B=paterson(md.observed_temperature); md.rheology_n=3*ones(md.numberofelements,1); @@ -27,5 +27,5 @@ pos=find(md.elementoniceshelf); md.drag_type=2; -md.drag_coefficient=20*ones(md.numberofgrids,1); +md.drag_coefficient=20*ones(md.numberofnodes,1); md.drag_coefficient(md.elements(pos,:))=0; md.drag_p=ones(md.numberofelements,1); Index: /issm/trunk/test/Par/SquareShelfConstrained.par =================================================================== --- /issm/trunk/test/Par/SquareShelfConstrained.par (revision 8304) +++ /issm/trunk/test/Par/SquareShelfConstrained.par (revision 8305) @@ -15,9 +15,9 @@ md.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y); clear vx vy x y index; -md.vz=zeros(md.numberofgrids,1); -md.pressure=zeros(md.numberofgrids,1); +md.vz=zeros(md.numberofnodes,1); +md.pressure=zeros(md.numberofnodes,1); %Materials -md.observed_temperature=(273-20)*ones(md.numberofgrids,1); +md.observed_temperature=(273-20)*ones(md.numberofnodes,1); md.rheology_B=paterson(md.observed_temperature); md.rheology_n=3*ones(md.numberofelements,1); @@ -25,11 +25,11 @@ %Accumulation and melting -md.accumulation_rate=10*ones(md.numberofgrids,1); -md.melting_rate=5*ones(md.numberofgrids,1); +md.accumulation_rate=10*ones(md.numberofnodes,1); +md.melting_rate=5*ones(md.numberofnodes,1); %Friction pos=find(md.elementoniceshelf); md.drag_type=2; -md.drag_coefficient=20*ones(md.numberofgrids,1); +md.drag_coefficient=20*ones(md.numberofnodes,1); md.drag_coefficient(md.elements(pos,:))=0; md.drag_p=ones(md.numberofelements,1); Index: /issm/trunk/test/Par/SquareThermal.par =================================================================== --- /issm/trunk/test/Par/SquareThermal.par (revision 8304) +++ /issm/trunk/test/Par/SquareThermal.par (revision 8305) @@ -7,17 +7,17 @@ disp(' creating thickness'); h=1000; -md.thickness=h*ones(md.numberofgrids,1); -md.firn_layer=10*ones(md.numberofgrids,1); -md.bed=-1000*ones(md.numberofgrids,1); +md.thickness=h*ones(md.numberofnodes,1); +md.firn_layer=10*ones(md.numberofnodes,1); +md.bed=-1000*ones(md.numberofnodes,1); md.surface=md.bed+md.thickness; disp(' creating velocities'); -md.vx=zeros(md.numberofgrids,1); -md.vy=zeros(md.numberofgrids,1); -md.vz=zeros(md.numberofgrids,1); +md.vx=zeros(md.numberofnodes,1); +md.vy=zeros(md.numberofnodes,1); +md.vz=zeros(md.numberofnodes,1); disp(' creating drag'); md.drag_type=2; %0 none 1 plastic 2 viscous -md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1. +md.drag_coefficient=200*ones(md.numberofnodes,1); %q=1. %Take care of iceshelves: no basal drag pos=find(md.elementoniceshelf); @@ -27,5 +27,5 @@ disp(' creating temperatures'); -md.observed_temperature=(273-20)*ones(md.numberofgrids,1); +md.observed_temperature=(273-20)*ones(md.numberofnodes,1); disp(' creating flow law paramter'); @@ -34,6 +34,6 @@ disp(' creating accumulation rates'); -md.accumulation_rate=ones(md.numberofgrids,1)/md.yts; %1m/a -md.melting_rate=0*ones(md.numberofgrids,1)/md.yts; %1m/a +md.accumulation_rate=ones(md.numberofnodes,1)/md.yts; %1m/a +md.melting_rate=0*ones(md.numberofnodes,1)/md.yts; %1m/a %Deal with boundary conditions: @@ -44,6 +44,6 @@ disp(' boundary conditions for thermal model'); md.temperature=md.observed_temperature; -md.spctemperature(:,1)=ones(md.numberofgrids,1); %surface temperature +md.spctemperature(:,1)=ones(md.numberofnodes,1); %surface temperature md.spctemperature(:,2)=md.observed_temperature; -md.geothermalflux=zeros(md.numberofgrids,1); +md.geothermalflux=zeros(md.numberofnodes,1); pos=find(md.elementonicesheet);md.geothermalflux(md.elements(pos,:))=1*10^-3; %1 mW/m^2