Index: /issm/trunk/test/NightlyRun/test1101.m =================================================================== --- /issm/trunk/test/NightlyRun/test1101.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test1101.m (revision 8304) @@ -21,6 +21,6 @@ %Create dirichlet on the bed only - md.spcvelocity=zeros(md.numberofgrids,6); - pos=find(md.gridonbed); + md.spcvelocity=zeros(md.numberofnodes,6); + pos=find(md.nodeonbed); md.spcvelocity(pos,1:2)=1; @@ -29,5 +29,5 @@ posx2=find(md.x==max(md.x)); - posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x)); %Don't take the same grids two times + posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x)); %Don't take the same nodes two times posy2=find(md.y==max(md.y) & md.x~=0 & md.x~=max(md.x)); @@ -42,6 +42,6 @@ vz=PatchToVec(md.results.DiagnosticSolution.Vz); results{i}=md.results.DiagnosticSolution; - minvx(i)=min(vx(end-md.numberofgrids2d+1:end)); - maxvx(i)=max(vx(end-md.numberofgrids2d+1:end)); + minvx(i)=min(vx(end-md.numberofnodes2d+1:end)); + maxvx(i)=max(vx(end-md.numberofnodes2d+1:end)); %Now plot vx, vy, vz and vx on a cross section Index: /issm/trunk/test/NightlyRun/test1102.m =================================================================== --- /issm/trunk/test/NightlyRun/test1102.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test1102.m (revision 8304) @@ -28,6 +28,6 @@ %Create dirichlet on the bed only - %md.spcvelocity=zeros(md.numberofgrids,6); - pos=find(md.gridonbed); + %md.spcvelocity=zeros(md.numberofnodes,6); + pos=find(md.nodeonbed); md.spcvelocity(pos,1:3)=1; @@ -35,9 +35,9 @@ %posx=find(md.x==0); %posx2=find(md.x==max(md.x)); - %posx=find(md.x==0 & md.y~=0 & md.y~=max(md.y) & ~md.gridonbed); - %posx2=find(md.x==max(md.x) & md.y~=0 & md.y~=max(md.y) & ~md.gridonbed); + %posx=find(md.x==0 & md.y~=0 & md.y~=max(md.y) & ~md.nodeonbed); + %posx2=find(md.x==max(md.x) & md.y~=0 & md.y~=max(md.y) & ~md.nodeonbed); - %posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x) & ~md.gridonbed); %Don't take the same grids two times - %posy2=find(md.y==max(md.y) & md.x~=0 & md.x~=max(md.x) & ~md.gridonbed); + %posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x) & ~md.nodeonbed); %Don't take the same nodes two times + %posy2=find(md.y==max(md.y) & md.x~=0 & md.x~=max(md.x) & ~md.nodeonbed); %md.penalties=[posx,posx2;posy,posy2]; @@ -55,6 +55,6 @@ pressure=PatchToVec(md.results.DiagnosticSolution.Pressure); results{i}=md.results.DiagnosticSolution; - minvx(i)=min(vx(end-md.numberofgrids2d+1:end)); - maxvx(i)=max(vx(end-md.numberofgrids2d+1:end)); + minvx(i)=min(vx(end-md.numberofnodes2d+1:end)); + maxvx(i)=max(vx(end-md.numberofnodes2d+1:end)); %Now plot vx, vy, vz and vx on a cross section Index: /issm/trunk/test/NightlyRun/test1103.m =================================================================== --- /issm/trunk/test/NightlyRun/test1103.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test1103.m (revision 8304) @@ -19,6 +19,6 @@ %Create dirichlet on the bed only - md.spcvelocity=zeros(md.numberofgrids,6); - pos=find(md.gridonbed); + md.spcvelocity=zeros(md.numberofnodes,6); + pos=find(md.nodeonbed); md.spcvelocity(pos,1:2)=1; @@ -27,5 +27,5 @@ posx2=find(md.x==max(md.x)); - posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x)); %Don't take the same grids two times + posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x)); %Don't take the same nodes two times posy2=find(md.y==max(md.y) & md.x~=0 & md.x~=max(md.x)); @@ -40,6 +40,6 @@ vz=PatchToVec(md.results.DiagnosticSolution.Vz); results{i}=md.results.DiagnosticSolution; - minvx(i)=min(vx(end-md.numberofgrids2d+1:end)); - maxvx(i)=max(vx(end-md.numberofgrids2d+1:end)); + minvx(i)=min(vx(end-md.numberofnodes2d+1:end)); + maxvx(i)=max(vx(end-md.numberofnodes2d+1:end)); %Now plot vx, vy, vz and vx on a cross section Index: /issm/trunk/test/NightlyRun/test1104.m =================================================================== --- /issm/trunk/test/NightlyRun/test1104.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test1104.m (revision 8304) @@ -18,6 +18,6 @@ %Create dirichlet on the bed only - md.spcvelocity=zeros(md.numberofgrids,6); - pos=find(md.gridonbed); + md.spcvelocity=zeros(md.numberofnodes,6); + pos=find(md.nodeonbed); md.spcvelocity(pos,1:2)=1; @@ -26,5 +26,5 @@ posx2=find(md.x==max(md.x)); - posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x)); %Don't take the same grids two times + posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x)); %Don't take the same nodes two times posy2=find(md.y==max(md.y) & md.x~=0 & md.x~=max(md.x)); Index: /issm/trunk/test/NightlyRun/test1105.m =================================================================== --- /issm/trunk/test/NightlyRun/test1105.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test1105.m (revision 8304) @@ -21,10 +21,10 @@ %Create MPCs to have periodic boundary conditions - md.spcvelocity=zeros(md.numberofgrids,6); + md.spcvelocity=zeros(md.numberofnodes,6); posx=find(md.x==0 & md.y~=0 & md.y~=L); posx2=find(md.x==L & md.y~=0 & md.y~=L); - posy=find(md.y==0 & md.x~=0 & md.x~=L); %Don't take the same grids two times + posy=find(md.y==0 & md.x~=0 & md.x~=L); %Don't take the same nodes two times posy2=find(md.y==L & md.x~=0 & md.x~=L); @@ -32,5 +32,5 @@ %Add spc on the corners - pos=find((md.x==0 | md.x==L) & (md.y==0 | md.y==L) & md.gridonbed); + pos=find((md.x==0 | md.x==L) & (md.y==0 | md.y==L) & md.nodeonbed); md.spcvelocity(pos,1:2)=1; if(L==5000), @@ -55,5 +55,5 @@ %Spc the bed at zero for vz - pos=find(md.gridonbed); + pos=find(md.nodeonbed); md.spcvelocity(pos,3)=1; @@ -66,6 +66,6 @@ vz=PatchToVec(md.results.DiagnosticSolution.Vz); results{i}=md.results.DiagnosticSolution; - minvx(i)=min(vx(end-md.numberofgrids2d+1:end)); - maxvx(i)=max(vx(end-md.numberofgrids2d+1:end)); + minvx(i)=min(vx(end-md.numberofnodes2d+1:end)); + maxvx(i)=max(vx(end-md.numberofnodes2d+1:end)); %Now plot vx, vy, vz and vx on a cross section Index: /issm/trunk/test/NightlyRun/test1106.m =================================================================== --- /issm/trunk/test/NightlyRun/test1106.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test1106.m (revision 8304) @@ -18,10 +18,10 @@ %Create MPCs to have periodic boundary conditions - %md.spcvelocity=zeros(md.numberofgrids,6); + %md.spcvelocity=zeros(md.numberofnodes,6); %posx=find(md.x==0); %posx2=find(md.x==L); - %posy=find(md.y==0 & md.x~=0 & md.x~=L); %Don't take the same grids two times + %posy=find(md.y==0 & md.x~=0 & md.x~=L); %Don't take the same nodes two times %posy2=find(md.y==L & md.x~=0 & md.x~=L); Index: /issm/trunk/test/NightlyRun/test1107.m =================================================================== --- /issm/trunk/test/NightlyRun/test1107.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test1107.m (revision 8304) @@ -21,11 +21,11 @@ %We need one grd on dirichlet: the 4 corners are set to zero - md.spcvelocity=zeros(md.numberofgrids,6); + md.spcvelocity=zeros(md.numberofnodes,6); %Create MPCs to have periodic boundary conditions - posx=find(md.x==0 & ~(md.y==0 & md.gridonbed) & ~(md.y==L & md.gridonbed)); - posx2=find(md.x==max(md.x) & ~(md.y==0 & md.gridonbed) & ~(md.y==L & md.gridonbed)); + posx=find(md.x==0 & ~(md.y==0 & md.nodeonbed) & ~(md.y==L & md.nodeonbed)); + posx2=find(md.x==max(md.x) & ~(md.y==0 & md.nodeonbed) & ~(md.y==L & md.nodeonbed)); - posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x)); %Don't take the same grids two times + posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x)); %Don't take the same nodes two times posy2=find(md.y==max(md.y) & md.x~=0 & md.x~=max(md.x)); @@ -33,5 +33,5 @@ %Add spc on the corners - pos=find((md.x==0 | md.x==L) & (md.y==0 | md.y==L) & md.gridonbed); + pos=find((md.x==0 | md.x==L) & (md.y==0 | md.y==L) & md.nodeonbed); md.spcvelocity(:,2)=1; md.spcvelocity(pos,1:2)=1; @@ -51,5 +51,5 @@ %Spc the bed at zero for vz - pos=find(md.gridonbed); + pos=find(md.nodeonbed); md.spcvelocity(pos,3)=1; @@ -62,6 +62,6 @@ vz=PatchToVec(md.results.DiagnosticSolution.Vz); results{i}=md.results.DiagnosticSolution; - minvx(i)=min(vx(end-md.numberofgrids2d+1:end)); - maxvx(i)=max(vx(end-md.numberofgrids2d+1:end)); + minvx(i)=min(vx(end-md.numberofnodes2d+1:end)); + maxvx(i)=max(vx(end-md.numberofnodes2d+1:end)); %Now plot vx, vy, vz and vx on a cross section Index: /issm/trunk/test/NightlyRun/test1108.m =================================================================== --- /issm/trunk/test/NightlyRun/test1108.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test1108.m (revision 8304) @@ -18,5 +18,5 @@ %We need one grd on dirichlet: the 4 corners are set to zero - %md.spcvelocity=zeros(md.numberofgrids,6); + %md.spcvelocity=zeros(md.numberofnodes,6); %pos=find((md.x==0 | md.x==max(md.x)) & (md.y==0 | md.y==max(md.y))); %md.spcvelocity(pos,1:3)=1; @@ -26,5 +26,5 @@ %posx2=find(md.x==max(md.x)); - %posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x)); %Don't take the same grids two times + %posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x)); %Don't take the same nodes two times %posy2=find(md.y==max(md.y) & md.x~=0 & md.x~=max(md.x)); Index: /issm/trunk/test/NightlyRun/test1109.m =================================================================== --- /issm/trunk/test/NightlyRun/test1109.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test1109.m (revision 8304) @@ -31,6 +31,6 @@ %Create spcs on the bed - pos=find(md.gridonbed); - md.spcvelocity=zeros(md.numberofgrids,6); + pos=find(md.nodeonbed); + md.spcvelocity=zeros(md.numberofnodes,6); md.spcvelocity(pos,1:3)=1; Index: /issm/trunk/test/NightlyRun/test1110.m =================================================================== --- /issm/trunk/test/NightlyRun/test1110.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test1110.m (revision 8304) @@ -23,13 +23,13 @@ if (i==1 | i==3), %Create dirichlet on the bed if no slip - pos=find(md.gridonbed); + pos=find(md.nodeonbed); md.spcvelocity(pos,1:3)=1; else - pos=find(md.gridonbed & (md.x==0 | md.x==max(md.x)) & (md.y==0 | md.y==max(md.y))); + pos=find(md.nodeonbed & (md.x==0 | md.x==max(md.x)) & (md.y==0 | md.y==max(md.y))); md.spcvelocity(pos,1:3)=1; md.spcvelocity(pos,4)=100; %because we need a dirichlet somewhere end - pos=find(~md.gridonbed); + pos=find(~md.nodeonbed); md.spctemperature(pos,2)=255; md.spctemperature(pos,1)=1; Index: /issm/trunk/test/NightlyRun/test1201.m =================================================================== --- /issm/trunk/test/NightlyRun/test1201.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test1201.m (revision 8304) @@ -12,7 +12,7 @@ disp(' initial velocity'); - md.vx=zeros(md.numberofgrids,1); - md.vy=-400*ones(md.numberofgrids,1); - md.vz=zeros(md.numberofgrids,1); + md.vx=zeros(md.numberofnodes,1); + md.vy=-400*ones(md.numberofnodes,1); + md.vz=zeros(md.numberofnodes,1); %analytical test Index: /issm/trunk/test/NightlyRun/test1205.m =================================================================== --- /issm/trunk/test/NightlyRun/test1205.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test1205.m (revision 8304) @@ -21,6 +21,6 @@ md=setelementstype(md,'hutter','all'); -%Spc the grids on the bed -pos=find(md.gridonbed); +%Spc the nodes on the bed +pos=find(md.nodeonbed); md.spcvelocity(pos,1:3)=1; @@ -31,15 +31,15 @@ vx=PatchToVec(md.results.DiagnosticSolution.Vx); vy=PatchToVec(md.results.DiagnosticSolution.Vy); -vel=zeros(md.numberofgrids2d,1); +vel=zeros(md.numberofnodes2d,1); -grid_vel=0; -for i=1:md.numberofgrids2d +node_vel=0; +for i=1:md.numberofnodes2d for j=1:(md.numlayers-1) - grid_vel=grid_vel+1/(2*(md.numlayers-1))*(sqrt(vx(i+j*md.numberofgrids2d,1).^2+... - vy(i+j*md.numberofgrids2d,1).^2)+... - sqrt(vx(i+(j-1)*md.numberofgrids2d,1).^2+vy(i+(j-1)*md.numberofgrids2d,1).^2)); + node_vel=node_vel+1/(2*(md.numlayers-1))*(sqrt(vx(i+j*md.numberofnodes2d,1).^2+... + vy(i+j*md.numberofnodes2d,1).^2)+... + sqrt(vx(i+(j-1)*md.numberofnodes2d,1).^2+vy(i+(j-1)*md.numberofnodes2d,1).^2)); end - vel(i,1)=grid_vel; - grid_vel=0; + vel(i,1)=node_vel; + node_vel=0; end @@ -63,5 +63,5 @@ subplot(2,2,3) hold on; -plot(sqrt((md.x(1:md.numberofgrids2d)).^2+(md.y(1:md.numberofgrids2d)).^2),vel,'r.'); +plot(sqrt((md.x(1:md.numberofnodes2d)).^2+(md.y(1:md.numberofnodes2d)).^2),vel,'r.'); plot(sqrt((md.x2d).^2+(md.y2d).^2),vel_obs,'b.'); title('Analytical vs calculated velocity','FontSize',14,'FontWeight','bold'); Index: /issm/trunk/test/NightlyRun/test1206.m =================================================================== --- /issm/trunk/test/NightlyRun/test1206.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test1206.m (revision 8304) @@ -21,6 +21,6 @@ md=setelementstype(md,'pattyn','all'); -%Spc the grids on the bed -pos=find(md.gridonbed); +%Spc the nodes on the bed +pos=find(md.nodeonbed); md.spcvelocity(pos,1:3)=1; @@ -31,15 +31,15 @@ vx=PatchToVec(md.results.DiagnosticSolution.Vx); vy=PatchToVec(md.results.DiagnosticSolution.Vy); -vel=zeros(md.numberofgrids2d,1); +vel=zeros(md.numberofnodes2d,1); -grid_vel=0; -for i=1:md.numberofgrids2d +node_vel=0; +for i=1:md.numberofnodes2d for j=1:(md.numlayers-1) - grid_vel=grid_vel+1/(2*(md.numlayers-1))*(sqrt(vx(i+j*md.numberofgrids2d,1).^2+... - vy(i+j*md.numberofgrids2d,1).^2)+... - sqrt(vx(i+(j-1)*md.numberofgrids2d,1).^2+vy(i+(j-1)*md.numberofgrids2d,1).^2)); + node_vel=node_vel+1/(2*(md.numlayers-1))*(sqrt(vx(i+j*md.numberofnodes2d,1).^2+... + vy(i+j*md.numberofnodes2d,1).^2)+... + sqrt(vx(i+(j-1)*md.numberofnodes2d,1).^2+vy(i+(j-1)*md.numberofnodes2d,1).^2)); end - vel(i,1)=grid_vel; - grid_vel=0; + vel(i,1)=node_vel; + node_vel=0; end @@ -62,5 +62,5 @@ subplot(2,2,3) hold on; -plot(sqrt((md.x(1:md.numberofgrids2d)).^2+(md.y(1:md.numberofgrids2d)).^2),vel,'r.'); +plot(sqrt((md.x(1:md.numberofnodes2d)).^2+(md.y(1:md.numberofnodes2d)).^2),vel,'r.'); plot(sqrt((md.x2d).^2+(md.y2d).^2),vel_obs,'b.'); title('Analytical vs calculated velocity','FontSize',14,'FontWeight','bold'); Index: /issm/trunk/test/NightlyRun/test1207.m =================================================================== --- /issm/trunk/test/NightlyRun/test1207.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test1207.m (revision 8304) @@ -21,6 +21,6 @@ md=setelementstype(md,'stokes','all'); -%Spc the grids on the bed -pos=find(md.gridonbed); +%Spc the nodes on the bed +pos=find(md.nodeonbed); md.spcvelocity(pos,1:3)=1; @@ -31,15 +31,15 @@ vx=PatchToVec(md.results.DiagnosticSolution.Vx); vy=PatchToVec(md.results.DiagnosticSolution.Vy); -vel=zeros(md.numberofgrids2d,1); +vel=zeros(md.numberofnodes2d,1); -grid_vel=0; -for i=1:md.numberofgrids2d +node_vel=0; +for i=1:md.numberofnodes2d for j=1:(md.numlayers-1) - grid_vel=grid_vel+1/(2*(md.numlayers-1))*(sqrt(vx(i+j*md.numberofgrids2d,1).^2+... - vy(i+j*md.numberofgrids2d,1).^2)+... - sqrt(vx(i+(j-1)*md.numberofgrids2d,1).^2+vy(i+(j-1)*md.numberofgrids2d,1).^2)); + node_vel=node_vel+1/(2*(md.numlayers-1))*(sqrt(vx(i+j*md.numberofnodes2d,1).^2+... + vy(i+j*md.numberofnodes2d,1).^2)+... + sqrt(vx(i+(j-1)*md.numberofnodes2d,1).^2+vy(i+(j-1)*md.numberofnodes2d,1).^2)); end - vel(i,1)=grid_vel; - grid_vel=0; + vel(i,1)=node_vel; + node_vel=0; end @@ -62,5 +62,5 @@ subplot(2,2,3) hold on; -plot(sqrt((md.x(1:md.numberofgrids2d)).^2+(md.y(1:md.numberofgrids2d)).^2),vel,'r.'); +plot(sqrt((md.x(1:md.numberofnodes2d)).^2+(md.y(1:md.numberofnodes2d)).^2),vel,'r.'); plot(sqrt((md.x2d).^2+(md.y2d).^2),vel_obs,'b.'); title('Analytical vs calculated velocity','FontSize',14,'FontWeight','bold'); Index: /issm/trunk/test/NightlyRun/test1208.m =================================================================== --- /issm/trunk/test/NightlyRun/test1208.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test1208.m (revision 8304) @@ -12,6 +12,6 @@ md=setelementstype(md,'hutter','all'); -%Spc the grids on the bed -pos=find(md.gridonbed); +%Spc the nodes on the bed +pos=find(md.nodeonbed); md.spcvelocity(pos,1:3)=1; Index: /issm/trunk/test/NightlyRun/test1301.m =================================================================== --- /issm/trunk/test/NightlyRun/test1301.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test1301.m (revision 8304) @@ -13,6 +13,6 @@ %Some conditions specific to melting test -md.pressure=zeros(md.numberofgrids,1); -md.observed_temperature=273.15*ones(md.numberofgrids,1); +md.pressure=zeros(md.numberofnodes,1); +md.observed_temperature=273.15*ones(md.numberofnodes,1); md.temperature=md.observed_temperature; md.spctemperature(:,2)=md.observed_temperature; @@ -28,5 +28,5 @@ %plot results -comp_melting=zeros(md.numberofgrids,1); +comp_melting=zeros(md.numberofnodes,1); comp_melting(md.results.ThermalSolution.MeltingRate.index)=md.results.ThermalSolution.MeltingRate.value; relative=abs((comp_melting-melting)./melting)*100; Index: /issm/trunk/test/NightlyRun/test1302.m =================================================================== --- /issm/trunk/test/NightlyRun/test1302.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test1302.m (revision 8304) @@ -14,7 +14,7 @@ pos1=find(md.elementonbed); md.spctemperature(md.elements(pos1,1:3),1)=1; md.spctemperature(md.elements(pos1,1:3),2)=10; pos2=find(md.elementonsurface); md.spctemperature(md.elements(pos2,4:6),1)=1; md.spctemperature(md.elements(pos2,4:6),2)=0; -md.vz=0.1*ones(md.numberofgrids,1); +md.vz=0.1*ones(md.numberofnodes,1); md.vel=sqrt( md.vx.^2+ md.vy.^2+ md.vz.^2); -md.pressure=zeros(md.numberofgrids,1); +md.pressure=zeros(md.numberofnodes,1); %analytical results @@ -29,5 +29,5 @@ %plot results -comp_temp=zeros(md.numberofgrids,1); +comp_temp=zeros(md.numberofnodes,1); comp_temp(md.results.ThermalSolution.Temperature.index)=md.results.ThermalSolution.Temperature.value; relative=abs((comp_temp-md.observed_temperature)./md.observed_temperature)*100; Index: /issm/trunk/test/NightlyRun/test1303.m =================================================================== --- /issm/trunk/test/NightlyRun/test1303.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test1303.m (revision 8304) @@ -13,5 +13,5 @@ pos1=find(md.elementonbed); md.spctemperature(md.elements(pos1,1:3),1)=1; md.spctemperature(md.elements(pos1,1:3),2)=10; pos2=find(md.elementonsurface); md.spctemperature(md.elements(pos2,4:6),1)=1; md.spctemperature(md.elements(pos2,4:6),2)=0; -md.pressure=zeros(md.numberofgrids,1); +md.pressure=zeros(md.numberofnodes,1); %analytical results @@ -24,5 +24,5 @@ %plot results -comp_temp=zeros(md.numberofgrids,1); +comp_temp=zeros(md.numberofnodes,1); comp_temp(md.results.ThermalSolution.Temperature.index)=md.results.ThermalSolution.Temperature.value; relative=abs((comp_temp-md.observed_temperature)./md.observed_temperature)*100; Index: /issm/trunk/test/NightlyRun/test1304.m =================================================================== --- /issm/trunk/test/NightlyRun/test1304.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test1304.m (revision 8304) @@ -13,5 +13,5 @@ pos2=find(md.elementonsurface); md.spctemperature(md.elements(pos2,4:6),1)=1; md.spctemperature(md.elements(pos2,4:6),2)=0; -md.pressure=zeros(md.numberofgrids,1); +md.pressure=zeros(md.numberofnodes,1); md.geothermalflux(:)=0.1; %100mW/m^2 @@ -25,5 +25,5 @@ %plot results -comp_temp=zeros(md.numberofgrids,1); +comp_temp=zeros(md.numberofnodes,1); comp_temp(md.results.ThermalSolution.Temperature.index)=md.results.ThermalSolution.Temperature.value; relative=abs((comp_temp-md.observed_temperature)./md.observed_temperature)*100; Index: /issm/trunk/test/NightlyRun/test131.m =================================================================== --- /issm/trunk/test/NightlyRun/test131.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test131.m (revision 8304) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); %Add boundary conditions on thickness on the border -pos=find(md.gridonboundary); +pos=find(md.nodeonboundary); md.spcthickness(pos,1)=1; md.spcthickness(pos,2)=md.thickness(pos); Index: /issm/trunk/test/NightlyRun/test132.m =================================================================== --- /issm/trunk/test/NightlyRun/test132.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test132.m (revision 8304) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); %Add boundary conditions on thickness on the border -pos=find(md.gridonboundary); +pos=find(md.nodeonboundary); md.spcthickness(pos,1)=1; md.spcthickness(pos,2)=md.thickness(pos); Index: /issm/trunk/test/NightlyRun/test133.m =================================================================== --- /issm/trunk/test/NightlyRun/test133.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test133.m (revision 8304) @@ -4,5 +4,5 @@ md=extrude(md,5,1); %Add boundary conditions on thickness on the border -pos=find(md.gridonboundary); +pos=find(md.nodeonboundary); md.spcthickness(pos,1)=1; md.spcthickness(pos,2)=md.thickness(pos); Index: /issm/trunk/test/NightlyRun/test134.m =================================================================== --- /issm/trunk/test/NightlyRun/test134.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test134.m (revision 8304) @@ -4,5 +4,5 @@ md=extrude(md,5,1); %Add boundary conditions on thickness on the border -pos=find(md.gridonboundary); +pos=find(md.nodeonboundary); md.spcthickness(pos,1)=1; md.spcthickness(pos,2)=md.thickness(pos); Index: /issm/trunk/test/NightlyRun/test223.m =================================================================== --- /issm/trunk/test/NightlyRun/test223.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test223.m (revision 8304) @@ -7,9 +7,9 @@ md.control_analysis=1; md.control_type=RheologyBbarEnum(); -md.cm_min=10^6*ones(md.numberofgrids,1); -md.cm_max=2*10^9*ones(md.numberofgrids,1); +md.cm_min=10^6*ones(md.numberofnodes,1); +md.cm_max=2*10^9*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceAbsVelMisfitEnum*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=10^7*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test224.m =================================================================== --- /issm/trunk/test/NightlyRun/test224.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test224.m (revision 8304) @@ -7,9 +7,9 @@ md.control_analysis=1; md.control_type=RheologyBbarEnum(); -md.cm_min=10^6*ones(md.numberofgrids,1); -md.cm_max=2*10^9*ones(md.numberofgrids,1); +md.cm_min=10^6*ones(md.numberofnodes,1); +md.cm_max=2*10^9*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceAbsVelMisfitEnum*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=10^7*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test225.m =================================================================== --- /issm/trunk/test/NightlyRun/test225.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test225.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=RheologyBbarEnum(); -md.cm_min=10^6*ones(md.numberofgrids,1); -md.cm_max=2*10^9*ones(md.numberofgrids,1); +md.cm_min=10^6*ones(md.numberofnodes,1); +md.cm_max=2*10^9*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceAbsVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=10^7*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test226.m =================================================================== --- /issm/trunk/test/NightlyRun/test226.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test226.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=RheologyBbarEnum(); -md.cm_min=10^6*ones(md.numberofgrids,1); -md.cm_max=2*10^9*ones(md.numberofgrids,1); +md.cm_min=10^6*ones(md.numberofnodes,1); +md.cm_max=2*10^9*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceAbsVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=10^7*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test227.m =================================================================== --- /issm/trunk/test/NightlyRun/test227.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test227.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=RheologyBbarEnum(); -md.cm_min=10^6*ones(md.numberofgrids,1); -md.cm_max=2*10^9*ones(md.numberofgrids,1); +md.cm_min=10^6*ones(md.numberofnodes,1); +md.cm_max=2*10^9*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceAbsVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=10^7*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test228.m =================================================================== --- /issm/trunk/test/NightlyRun/test228.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test228.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=RheologyBbarEnum(); -md.cm_min=10^6*ones(md.numberofgrids,1); -md.cm_max=2*10^9*ones(md.numberofgrids,1); +md.cm_min=10^6*ones(md.numberofnodes,1); +md.cm_max=2*10^9*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceAbsVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=10^7*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test229.m =================================================================== --- /issm/trunk/test/NightlyRun/test229.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test229.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=RheologyBbarEnum(); -md.cm_min=10^6*ones(md.numberofgrids,1); -md.cm_max=2*10^9*ones(md.numberofgrids,1); +md.cm_min=10^6*ones(md.numberofnodes,1); +md.cm_max=2*10^9*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceAbsVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=10^7*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test230.m =================================================================== --- /issm/trunk/test/NightlyRun/test230.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test230.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=RheologyBbarEnum(); -md.cm_min=10^6*ones(md.numberofgrids,1); -md.cm_max=2*10^9*ones(md.numberofgrids,1); +md.cm_min=10^6*ones(md.numberofnodes,1); +md.cm_max=2*10^9*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceAbsVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=10^7*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test233.m =================================================================== --- /issm/trunk/test/NightlyRun/test233.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test233.m (revision 8304) @@ -21,16 +21,16 @@ h=1000; -md.thickness=h*ones(md.numberofgrids,1); +md.thickness=h*ones(md.numberofnodes,1); md.bed=-md.rho_ice/md.rho_water*md.thickness; md.surface=md.bed+md.thickness; %Initial velocity and pressure -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); @@ -38,5 +38,5 @@ %Boundary conditions: -md.spcvelocity=zeros(md.numberofgrids,6); +md.spcvelocity=zeros(md.numberofnodes,6); %constrain flanks to 0 normal velocity @@ -51,7 +51,7 @@ %icefront -gridonicefront=zeros(md.numberofgrids,1); -pos=find(md.y==ymax); gridonicefront(pos)=1; -pos=find(gridonicefront(md.segments(:,1)) | gridonicefront(md.segments(:,2))); pressureload=md.segments(pos,:); +nodeonicefront=zeros(md.numberofnodes,1); +pos=find(md.y==ymax); nodeonicefront(pos)=1; +pos=find(nodeonicefront(md.segments(:,1)) | nodeonicefront(md.segments(:,2))); pressureload=md.segments(pos,:); pressureload=[pressureload WaterEnum*md.elementoniceshelf(pressureload(:,end))]; md.pressureload=pressureload; Index: /issm/trunk/test/NightlyRun/test234.m =================================================================== --- /issm/trunk/test/NightlyRun/test234.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test234.m (revision 8304) @@ -21,16 +21,16 @@ h=1000; -md.thickness=h*ones(md.numberofgrids,1); +md.thickness=h*ones(md.numberofnodes,1); md.bed=-md.rho_ice/md.rho_water*md.thickness; md.surface=md.bed+md.thickness; %Initial velocity and pressure -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); @@ -38,5 +38,5 @@ %Boundary conditions: -md.spcvelocity=zeros(md.numberofgrids,6); +md.spcvelocity=zeros(md.numberofnodes,6); %constrain flanks to 0 normal velocity @@ -51,7 +51,7 @@ %icefront -gridonicefront=zeros(md.numberofgrids,1); -pos=find(md.y==ymax); gridonicefront(pos)=1; -pos=find(gridonicefront(md.segments(:,1)) | gridonicefront(md.segments(:,2))); pressureload=md.segments(pos,:); +nodeonicefront=zeros(md.numberofnodes,1); +pos=find(md.y==ymax); nodeonicefront(pos)=1; +pos=find(nodeonicefront(md.segments(:,1)) | nodeonicefront(md.segments(:,2))); pressureload=md.segments(pos,:); pressureload=[pressureload WaterEnum*md.elementoniceshelf(pressureload(:,end))]; md.pressureload=pressureload; Index: /issm/trunk/test/NightlyRun/test235.m =================================================================== --- /issm/trunk/test/NightlyRun/test235.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test235.m (revision 8304) @@ -18,16 +18,16 @@ h=1000; -md.thickness=h*ones(md.numberofgrids,1); +md.thickness=h*ones(md.numberofnodes,1); md.bed=-md.rho_ice/md.rho_water*md.thickness; md.surface=md.bed+md.thickness; %Initial velocity and pressure -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); @@ -35,5 +35,5 @@ %Boundary conditions: -md.spcvelocity=zeros(md.numberofgrids,6); +md.spcvelocity=zeros(md.numberofnodes,6); %constrain flanks to 0 normal velocity @@ -48,12 +48,12 @@ %icefront -gridonicefront=zeros(md.numberofgrids,1); -pos=find(md.y==ymax); gridonicefront(pos)=1; -pos=find(gridonicefront(md.segments(:,1)) | gridonicefront(md.segments(:,2))); pressureload=md.segments(pos,:); +nodeonicefront=zeros(md.numberofnodes,1); +pos=find(md.y==ymax); nodeonicefront(pos)=1; +pos=find(nodeonicefront(md.segments(:,1)) | nodeonicefront(md.segments(:,2))); pressureload=md.segments(pos,:); pressureload=[pressureload WaterEnum*md.elementoniceshelf(pressureload(:,end))]; md.pressureload=pressureload; %partitioning -md.npart=md.numberofgrids; +md.npart=md.numberofnodes; md=partitioner(md,'package','linear','npart',md.npart); md.part=md.part-1; Index: /issm/trunk/test/NightlyRun/test236.m =================================================================== --- /issm/trunk/test/NightlyRun/test236.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test236.m (revision 8304) @@ -18,16 +18,16 @@ h=1000; -md.thickness=h*ones(md.numberofgrids,1); +md.thickness=h*ones(md.numberofnodes,1); md.bed=-md.rho_ice/md.rho_water*md.thickness; md.surface=md.bed+md.thickness; %Initial velocity and pressure -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); @@ -35,5 +35,5 @@ %Boundary conditions: -md.spcvelocity=zeros(md.numberofgrids,6); +md.spcvelocity=zeros(md.numberofnodes,6); %constrain flanks to 0 normal velocity @@ -48,12 +48,12 @@ %icefront -gridonicefront=zeros(md.numberofgrids,1); -pos=find(md.y==ymax); gridonicefront(pos)=1; -pos=find(gridonicefront(md.segments(:,1)) | gridonicefront(md.segments(:,2))); pressureload=md.segments(pos,:); +nodeonicefront=zeros(md.numberofnodes,1); +pos=find(md.y==ymax); nodeonicefront(pos)=1; +pos=find(nodeonicefront(md.segments(:,1)) | nodeonicefront(md.segments(:,2))); pressureload=md.segments(pos,:); pressureload=[pressureload WaterEnum*md.elementoniceshelf(pressureload(:,end))]; md.pressureload=pressureload; %partitioning -md.npart=md.numberofgrids; +md.npart=md.numberofnodes; md=partitioner(md,'package','linear','npart',md.npart); md.part=md.part-1; Index: /issm/trunk/test/NightlyRun/test337.m =================================================================== --- /issm/trunk/test/NightlyRun/test337.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test337.m (revision 8304) @@ -7,9 +7,9 @@ md.control_analysis=1; md.control_type=DragCoefficientEnum(); -md.cm_min=1*ones(md.numberofgrids,1); -md.cm_max=200*ones(md.numberofgrids,1); +md.cm_min=1*ones(md.numberofnodes,1); +md.cm_max=200*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=3*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test338.m =================================================================== --- /issm/trunk/test/NightlyRun/test338.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test338.m (revision 8304) @@ -7,9 +7,9 @@ md.control_analysis=1; md.control_type=DragCoefficientEnum(); -md.cm_min=1*ones(md.numberofgrids,1); -md.cm_max=200*ones(md.numberofgrids,1); +md.cm_min=1*ones(md.numberofnodes,1); +md.cm_max=200*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=3*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test339.m =================================================================== --- /issm/trunk/test/NightlyRun/test339.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test339.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=DragCoefficientEnum(); -md.cm_min=1*ones(md.numberofgrids,1); -md.cm_max=200*ones(md.numberofgrids,1); +md.cm_min=1*ones(md.numberofnodes,1); +md.cm_max=200*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=3*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test340.m =================================================================== --- /issm/trunk/test/NightlyRun/test340.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test340.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=DragCoefficientEnum(); -md.cm_min=1*ones(md.numberofgrids,1); -md.cm_max=200*ones(md.numberofgrids,1); +md.cm_min=1*ones(md.numberofnodes,1); +md.cm_max=200*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=3*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test341.m =================================================================== --- /issm/trunk/test/NightlyRun/test341.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test341.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=DragCoefficientEnum(); -md.cm_min=1*ones(md.numberofgrids,1); -md.cm_max=200*ones(md.numberofgrids,1); +md.cm_min=1*ones(md.numberofnodes,1); +md.cm_max=200*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceRelVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=3*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test342.m =================================================================== --- /issm/trunk/test/NightlyRun/test342.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test342.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=DragCoefficientEnum(); -md.cm_min=1*ones(md.numberofgrids,1); -md.cm_max=200*ones(md.numberofgrids,1); +md.cm_min=1*ones(md.numberofnodes,1); +md.cm_max=200*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceRelVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=3*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test343.m =================================================================== --- /issm/trunk/test/NightlyRun/test343.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test343.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=DragCoefficientEnum(); -md.cm_min=1*ones(md.numberofgrids,1); -md.cm_max=200*ones(md.numberofgrids,1); +md.cm_min=1*ones(md.numberofnodes,1); +md.cm_max=200*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceLogVxVyMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=3*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test344.m =================================================================== --- /issm/trunk/test/NightlyRun/test344.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test344.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=DragCoefficientEnum(); -md.cm_min=1*ones(md.numberofgrids,1); -md.cm_max=200*ones(md.numberofgrids,1); +md.cm_min=1*ones(md.numberofnodes,1); +md.cm_max=200*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceLogVxVyMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=3*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test423.m =================================================================== --- /issm/trunk/test/NightlyRun/test423.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test423.m (revision 8304) @@ -6,5 +6,5 @@ %partitioning -md.npart=md.numberofgrids; +md.npart=md.numberofnodes; md=partitioner(md,'package','linear','npart',md.npart); md.part=md.part-1; Index: /issm/trunk/test/NightlyRun/test424.m =================================================================== --- /issm/trunk/test/NightlyRun/test424.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test424.m (revision 8304) @@ -6,5 +6,5 @@ %partitioning -md.npart=md.numberofgrids; +md.npart=md.numberofnodes; md=partitioner(md,'package','linear','npart',md.npart); md.part=md.part-1; Index: /issm/trunk/test/NightlyRun/test429.m =================================================================== --- /issm/trunk/test/NightlyRun/test429.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test429.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=DragCoefficientEnum(); -md.cm_min=1*ones(md.numberofgrids,1); -md.cm_max=200*ones(md.numberofgrids,1); +md.cm_min=1*ones(md.numberofnodes,1); +md.cm_max=200*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=3*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test430.m =================================================================== --- /issm/trunk/test/NightlyRun/test430.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test430.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=DragCoefficientEnum(); -md.cm_min=1*ones(md.numberofgrids,1); -md.cm_max=200*ones(md.numberofgrids,1); +md.cm_min=1*ones(md.numberofnodes,1); +md.cm_max=200*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=3*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test431.m =================================================================== --- /issm/trunk/test/NightlyRun/test431.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test431.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=DragCoefficientEnum(); -md.cm_min=1*ones(md.numberofgrids,1); -md.cm_max=200*ones(md.numberofgrids,1); +md.cm_min=1*ones(md.numberofnodes,1); +md.cm_max=200*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceRelVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=3*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test432.m =================================================================== --- /issm/trunk/test/NightlyRun/test432.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test432.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=DragCoefficientEnum(); -md.cm_min=1*ones(md.numberofgrids,1); -md.cm_max=200*ones(md.numberofgrids,1); +md.cm_min=1*ones(md.numberofnodes,1); +md.cm_max=200*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceRelVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=3*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test435.m =================================================================== --- /issm/trunk/test/NightlyRun/test435.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test435.m (revision 8304) @@ -11,11 +11,11 @@ md.part=md.part-1; -vector=(1:1:md.numberofgrids)'; +vector=(1:1:md.numberofnodes)'; vector_on_partition=AreaAverageOntoPartition(md,vector); -vector_on_grids=vector_on_partition(md.part+1); +vector_on_nodes=vector_on_partition(md.part+1); -field_names ={'vector_on_grids'}; +field_names ={'vector_on_nodes'}; field_tolerances={1e-11}; field_values={... - vector_on_grids,... + vector_on_nodes,... }; Index: /issm/trunk/test/NightlyRun/test446.m =================================================================== --- /issm/trunk/test/NightlyRun/test446.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test446.m (revision 8304) @@ -4,5 +4,5 @@ %mesh {{{1 md=roundmesh(model,radius,resolution); -%fix center grid to 0,0 +%fix center node to 0,0 rad=sqrt((md.x).*md.x+(md.y).*md.y); pos=find(rad==min(rad)); Index: /issm/trunk/test/NightlyRun/test521.m =================================================================== --- /issm/trunk/test/NightlyRun/test521.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test521.m (revision 8304) @@ -13,9 +13,9 @@ md.control_analysis=1; md.control_type=RheologyBbarEnum(); -md.cm_min=10^6*ones(md.numberofgrids,1); -md.cm_max=2*10^9*ones(md.numberofgrids,1); +md.cm_min=10^6*ones(md.numberofnodes,1); +md.cm_max=2*10^9*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceAbsVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=10^8*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test522.m =================================================================== --- /issm/trunk/test/NightlyRun/test522.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test522.m (revision 8304) @@ -13,9 +13,9 @@ md.control_analysis=1; md.control_type=RheologyBbarEnum(); -md.cm_min=10^6*ones(md.numberofgrids,1); -md.cm_max=2*10^9*ones(md.numberofgrids,1); +md.cm_min=10^6*ones(md.numberofnodes,1); +md.cm_max=2*10^9*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceAbsVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=10^8*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test523.m =================================================================== --- /issm/trunk/test/NightlyRun/test523.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test523.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=DragCoefficientEnum(); -md.cm_min=1*ones(md.numberofgrids,1); -md.cm_max=200*ones(md.numberofgrids,1); +md.cm_min=1*ones(md.numberofnodes,1); +md.cm_max=200*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=3*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test524.m =================================================================== --- /issm/trunk/test/NightlyRun/test524.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test524.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=DragCoefficientEnum(); -md.cm_min=1*ones(md.numberofgrids,1); -md.cm_max=200*ones(md.numberofgrids,1); +md.cm_min=1*ones(md.numberofnodes,1); +md.cm_max=200*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=3*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test525.m =================================================================== --- /issm/trunk/test/NightlyRun/test525.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test525.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=DragCoefficientEnum(); -md.cm_min=1*ones(md.numberofgrids,1); -md.cm_max=200*ones(md.numberofgrids,1); +md.cm_min=1*ones(md.numberofnodes,1); +md.cm_max=200*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=3*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test526.m =================================================================== --- /issm/trunk/test/NightlyRun/test526.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test526.m (revision 8304) @@ -8,9 +8,9 @@ md.control_analysis=1; md.control_type=DragCoefficientEnum(); -md.cm_min=1*ones(md.numberofgrids,1); -md.cm_max=200*ones(md.numberofgrids,1); +md.cm_min=1*ones(md.numberofnodes,1); +md.cm_max=200*ones(md.numberofnodes,1); md.nsteps=2; md.cm_responses=SurfaceLogVelMisfitEnum()*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=3*ones(md.nsteps,1); md.maxiter=2*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test527.m =================================================================== --- /issm/trunk/test/NightlyRun/test527.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test527.m (revision 8304) @@ -27,6 +27,6 @@ %refine existing mesh 3 -hVertices=NaN*ones(md.numberofgrids,1); -hVertices(find(md.gridonboundary))=500; +hVertices=NaN*ones(md.numberofnodes,1); +hVertices(find(md.nodeonboundary))=500; md2=bamg(md,'metric',md.dummy,'hmin',1000,'hmax',20000,'gradation',3,'geometricalmetric',1,'anisomax',1,'hVertices',hVertices); x5=md2.x; Index: /issm/trunk/test/NightlyRun/test621.m =================================================================== --- /issm/trunk/test/NightlyRun/test621.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test621.m (revision 8304) @@ -10,8 +10,8 @@ md.control_type=DhDtEnum; md.thickness_obs=md.thickness; -md.cm_min=-50*ones(md.numberofgrids,1); -md.cm_max=50*ones(md.numberofgrids,1); +md.cm_min=-50*ones(md.numberofnodes,1); +md.cm_max=50*ones(md.numberofnodes,1); md.cm_responses=ThicknessAbsMisfitEnum*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=10/md.yts*ones(md.nsteps,1); md.maxiter=4*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test622.m =================================================================== --- /issm/trunk/test/NightlyRun/test622.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test622.m (revision 8304) @@ -10,8 +10,8 @@ md.control_type=DhDtEnum; md.thickness_obs=md.thickness; -md.cm_min=-50*ones(md.numberofgrids,1); -md.cm_max=50*ones(md.numberofgrids,1); +md.cm_min=-50*ones(md.numberofnodes,1); +md.cm_max=50*ones(md.numberofnodes,1); md.cm_responses=ThicknessAbsMisfitEnum*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=10/md.yts*ones(md.nsteps,1); md.maxiter=4*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test623.m =================================================================== --- /issm/trunk/test/NightlyRun/test623.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test623.m (revision 8304) @@ -11,8 +11,8 @@ md.control_type=DhDtEnum; md.thickness_obs=md.thickness; -md.cm_min=-50*ones(md.numberofgrids,1); -md.cm_max=50*ones(md.numberofgrids,1); +md.cm_min=-50*ones(md.numberofnodes,1); +md.cm_max=50*ones(md.numberofnodes,1); md.cm_responses=ThicknessAbsMisfitEnum*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=10/md.yts*ones(md.nsteps,1); md.maxiter=4*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test624.m =================================================================== --- /issm/trunk/test/NightlyRun/test624.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test624.m (revision 8304) @@ -11,8 +11,8 @@ md.control_type=DhDtEnum; md.thickness_obs=md.thickness; -md.cm_min=-50*ones(md.numberofgrids,1); -md.cm_max=50*ones(md.numberofgrids,1); +md.cm_min=-50*ones(md.numberofnodes,1); +md.cm_max=50*ones(md.numberofnodes,1); md.cm_responses=ThicknessAbsMisfitEnum*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.optscal=10/md.yts*ones(md.nsteps,1); md.maxiter=4*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test625.m =================================================================== --- /issm/trunk/test/NightlyRun/test625.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test625.m (revision 8304) @@ -7,5 +7,5 @@ %Ice sheet only md=modelextract(md,md.elementonicesheet); -pos=find(md.gridonboundary); +pos=find(md.nodeonboundary); md.spcthickness(pos,1)=1; md.spcthickness(:,2)=md.thickness; @@ -19,8 +19,8 @@ md.prognostic_DG=0; md.optscal=[10/md.yts*ones(md.nsteps,1) 10/md.yts*ones(md.nsteps,1)]; -md.cm_min=[-2000*ones(md.numberofgrids,1) -2000*ones(md.numberofgrids,1)]; -md.cm_max=[+2000*ones(md.numberofgrids,1) +2000*ones(md.numberofgrids,1)]; +md.cm_min=[-2000*ones(md.numberofnodes,1) -2000*ones(md.numberofnodes,1)]; +md.cm_max=[+2000*ones(md.numberofnodes,1) +2000*ones(md.numberofnodes,1)]; md.cm_responses=ThicknessAbsMisfitEnum*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.maxiter=4*ones(md.nsteps,1); md.cm_jump=0.99*ones(md.nsteps,1); Index: /issm/trunk/test/NightlyRun/test626.m =================================================================== --- /issm/trunk/test/NightlyRun/test626.m (revision 8303) +++ /issm/trunk/test/NightlyRun/test626.m (revision 8304) @@ -7,5 +7,5 @@ %Ice sheet only md=modelextract(md,md.elementonicesheet); -pos=find(md.gridonboundary); +pos=find(md.nodeonboundary); md.spcthickness(pos,1)=1; md.spcthickness(:,2)=md.thickness; @@ -19,8 +19,8 @@ md.prognostic_DG=0; md.optscal=[10/md.yts*ones(md.nsteps,1) 10/md.yts*ones(md.nsteps,1)]; -md.cm_min=[-2000*ones(md.numberofgrids,1) -2000*ones(md.numberofgrids,1)]; -md.cm_max=[+2000*ones(md.numberofgrids,1) +2000*ones(md.numberofgrids,1)]; +md.cm_min=[-2000*ones(md.numberofnodes,1) -2000*ones(md.numberofnodes,1)]; +md.cm_max=[+2000*ones(md.numberofnodes,1) +2000*ones(md.numberofnodes,1)]; md.cm_responses=ThicknessAbsMisfitEnum*ones(md.nsteps,1); -md.weights=ones(md.numberofgrids,1); +md.weights=ones(md.numberofnodes,1); md.maxiter=4*ones(md.nsteps,1); md.cm_jump=0.99*ones(md.nsteps,1);