Index: /issm/trunk/src/m/classes/model/model.m =================================================================== --- /issm/trunk/src/m/classes/model/model.m (revision 9683) +++ /issm/trunk/src/m/classes/model/model.m (revision 9684) @@ -36,5 +36,6 @@ inversion = modelfield('default',0,'marshall',true); transient = modelfield('default',0,'marshall',true); - diagnostic = modelfield('default',0,'marshall',true); + diagnostic = modelfield('default',0,'marshall',true); + initialization = modelfield('default',0,'marshall',true); %FIXME: all other fields should belong to other classes @@ -105,13 +106,4 @@ output_frequency = modelfield('default',0,'marshall',true,'format','Integer'); results_on_vertices = modelfield('default',0,'marshall',true,'format','Boolean'); - vx = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); - vy = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); - vz = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); - vel = modelfield('default',NaN,'marshall',false); - temperature = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); %temperature solution vector - waterfraction = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); - pressure = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); - %Hydrology - watercolumn = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); %Parallelisation @@ -351,4 +343,11 @@ if isfield(structmd,'vel_obs'), md.inversion.vel_obs=structmd.vel_obs; end if isfield(structmd,'thickness_obs'), md.inversion.thickness_obs=structmd.thickness_obs; end + if isfield(structmd,'vx'), md.initialization.vx=structmd.vx; end + if isfield(structmd,'vy'), md.initialization.vy=structmd.vy; end + if isfield(structmd,'vz'), md.initialization.vz=structmd.vz; end + if isfield(structmd,'pressure'), md.initialization.pressure=structmd.pressure; end + if isfield(structmd,'temperature'), md.initialization.temperature=structmd.temperature; end + if isfield(structmd,'waterfraction'), md.initialization.waterfraction=structmd.waterfraction; end + if isfield(structmd,'watercolumn'), md.initialization.watercolumn=structmd.watercolumn; end %Field changes @@ -478,5 +477,6 @@ md.inversion = inversion; md.transient = transient; - md.diagnostic=diagnostic; + md.diagnostic =diagnostic; + md.initialization =initialization; %Solver parameters Index: /issm/trunk/src/m/model/DepthAverage.m =================================================================== --- /issm/trunk/src/m/model/DepthAverage.m (revision 9683) +++ /issm/trunk/src/m/model/DepthAverage.m (revision 9684) @@ -6,5 +6,5 @@ % % Example: -% vel_bar=DepthAverage(md,md.vel); +% vel_bar=DepthAverage(md,md.initialization.vel); %check that the model given in input is 3d Index: /issm/trunk/src/m/model/averaging.m =================================================================== --- /issm/trunk/src/m/model/averaging.m (revision 9683) +++ /issm/trunk/src/m/model/averaging.m (revision 9684) @@ -13,6 +13,6 @@ % % Examples: -% velsmoothed=averaging(md,md.vel,4); -% pressure=averaging(md,md.pressure,0); +% velsmoothed=averaging(md,md.initialization.vel,4); +% pressure=averaging(md,md.initialization.pressure,0); if length(data)~=md.numberofelements & length(data)~=md.numberofnodes Index: /issm/trunk/src/m/model/basalstress.m =================================================================== --- /issm/trunk/src/m/model/basalstress.m (revision 9683) +++ /issm/trunk/src/m/model/basalstress.m (revision 9684) @@ -13,7 +13,7 @@ %compute horizontal velocity -ub=sqrt(md.vx.^2+md.vy.^2)/md.constants.yts; -ubx=md.vx/md.constants.yts; -uby=md.vy/md.constants.yts; +ub=sqrt(md.initialization.vx.^2+md.initialization.vy.^2)/md.constants.yts; +ubx=md.initialization.vx/md.constants.yts; +uby=md.initialization.vy/md.constants.yts; %compute basal drag Index: /issm/trunk/src/m/model/basevert.m =================================================================== --- /issm/trunk/src/m/model/basevert.m (revision 9683) +++ /issm/trunk/src/m/model/basevert.m (revision 9684) @@ -20,6 +20,6 @@ end -hu=md.thickness.*md.vx; -hv=md.thickness.*md.vy; +hu=md.thickness.*md.initialization.vx; +hv=md.thickness.*md.initialization.vy; summation=[1;1;1]; @@ -27,6 +27,6 @@ hvy=(hv(md.elements).*beta)*summation; -uelem=md.vx(md.elements)*summation/3; -velem=md.vy(md.elements)*summation/3; +uelem=md.initialization.vx(md.elements)*summation/3; +velem=md.initialization.vy(md.elements)*summation/3; dbdx=(md.bed(md.elements).*alpha)*summation; Index: /issm/trunk/src/m/model/collapse.m =================================================================== --- /issm/trunk/src/m/model/collapse.m (revision 9683) +++ /issm/trunk/src/m/model/collapse.m (revision 9684) @@ -35,8 +35,8 @@ %results -if ~isnan(md.vx),md.vx=DepthAverage(md,md.vx);end; -if ~isnan(md.vy),md.vy=DepthAverage(md,md.vy);end; -if ~isnan(md.vz),md.vz=DepthAverage(md,md.vz);end; -if ~isnan(md.vel),md.vel=DepthAverage(md,md.vel);end; +if ~isnan(md.initialization.vx),md.initialization.vx=DepthAverage(md,md.initialization.vx);end; +if ~isnan(md.initialization.vy),md.initialization.vy=DepthAverage(md,md.initialization.vy);end; +if ~isnan(md.initialization.vz),md.initialization.vz=DepthAverage(md,md.initialization.vz);end; +if ~isnan(md.initialization.vel),md.initialization.vel=DepthAverage(md,md.initialization.vel);end; %bedinfo and surface info Index: /issm/trunk/src/m/model/contourmassbalance.m =================================================================== --- /issm/trunk/src/m/model/contourmassbalance.m (revision 9683) +++ /issm/trunk/src/m/model/contourmassbalance.m (revision 9684) @@ -10,5 +10,5 @@ error('contourmassbalance error message: bad usage'); end -if ((length(md.vx)~=md.numberofnodes)|(length(md.vy)~=md.numberofnodes)) +if ((length(md.initialization.vx)~=md.numberofnodes)|(length(md.initialization.vy)~=md.numberofnodes)) error(['thicknessevolution error message: vx and vy should have a length of ' num2str(md.numberofnodes)]) end @@ -28,6 +28,6 @@ x=md.x; y=md.y; -vx=mean(md.vx(segments(:,1:end-1)),2); -vy=mean(md.vy(segments(:,1:end-1)),2); +vx=mean(md.initialization.vx(segments(:,1:end-1)),2); +vy=mean(md.initialization.vy(segments(:,1:end-1)),2); H=mean(md.thickness(segments(:,1:end-1)),2); nx=cos(atan2((x(segments(:,1))-x(segments(:,2))) , (y(segments(:,2))-y(segments(:,1))))); Index: /issm/trunk/src/m/model/extrude.m =================================================================== --- /issm/trunk/src/m/model/extrude.m (revision 9683) +++ /issm/trunk/src/m/model/extrude.m (revision 9684) @@ -140,10 +140,10 @@ %results -if ~isnan(md.vx),md.vx=project3d(md,'vector',md.vx,'type','node');end; -if ~isnan(md.vy),md.vy=project3d(md,'vector',md.vy,'type','node');end; -if ~isnan(md.vz),md.vz=project3d(md,'vector',md.vz,'type','node');end; -if ~isnan(md.vel),md.vel=project3d(md,'vector',md.vel,'type','node');end; -if ~isnan(md.temperature),md.temperature=project3d(md,'vector',md.temperature,'type','node');end; -if ~isnan(md.waterfraction),md.waterfraction=project3d(md,'vector',md.waterfraction,'type','node');end; +if ~isnan(md.initialization.vx),md.initialization.vx=project3d(md,'vector',md.initialization.vx,'type','node');end; +if ~isnan(md.initialization.vy),md.initialization.vy=project3d(md,'vector',md.initialization.vy,'type','node');end; +if ~isnan(md.initialization.vz),md.initialization.vz=project3d(md,'vector',md.initialization.vz,'type','node');end; +if ~isnan(md.initialization.vel),md.initialization.vel=project3d(md,'vector',md.initialization.vel,'type','node');end; +if ~isnan(md.initialization.temperature),md.initialization.temperature=project3d(md,'vector',md.initialization.temperature,'type','node');end; +if ~isnan(md.initialization.waterfraction),md.initialization.waterfraction=project3d(md,'vector',md.initialization.waterfraction,'type','node');end; %bedinfo and surface info @@ -212,6 +212,6 @@ %Put lithostatic pressure is there is an existing pressure -if ~isnan(md.pressure), - md.pressure=md.constants.g*md.materials.rho_ice*(md.surface-md.z); +if ~isnan(md.initialization.pressure), + md.initialization.pressure=md.constants.g*md.materials.rho_ice*(md.surface-md.z); end Index: /issm/trunk/src/m/model/ismodelselfconsistent.m =================================================================== --- /issm/trunk/src/m/model/ismodelselfconsistent.m (revision 9683) +++ /issm/trunk/src/m/model/ismodelselfconsistent.m (revision 9684) @@ -398,6 +398,6 @@ %INITIAL VELOCITY - if ~isnan(md.vx) & ~isnan(md.vy), - fields={'vx','vy'}; + if ~isnan(md.initialization.vx) & ~isnan(md.initialization.vy), + fields={'initialization.vx','initialization.vy'}; checknan(md,fields); checksize(md,fields,[md.numberofnodes 1]); @@ -454,5 +454,5 @@ % {{{2 %INITIAL VELOCITIES - fields={'vx','vy'}; + fields={'initialization.vx','initialization.vy'}; checksize(md,fields,[md.numberofnodes 1]); checknan(md,fields); @@ -480,5 +480,5 @@ fields={'hydrology.spcwatercolumn'}; checkforcing(md,fields); - fields={'watercolumn'}; + fields={'initialization.watercolumn'}; checksize(md,fields,[md.numberofnodes 1]); %}}} @@ -504,5 +504,5 @@ %VELOCITIES AND PRESSURE - fields={'vx','vy','vz','pressure','basalforcings.geothermalflux'}; + fields={'initialization.vx','initialization.vy','initialization.vz','initialization.pressure','basalforcings.geothermalflux'}; checksize(md,fields,[md.numberofnodes 1]); checknan(md,fields); @@ -516,10 +516,10 @@ %INITIAL TEMPERATURE, MELTING AND ACCUMULATION - fields={'temperature','basalforcings.melting_rate'}; + fields={'initialization.temperature','basalforcings.melting_rate'}; checksize(md,fields,[md.numberofnodes 1]); checknan(md,fields); %INITIAL TEMPERATURE - fields={'temperature'}; + fields={'initialization.temperature'}; checkgreater(md,fields,0) @@ -543,5 +543,5 @@ %VELOCITIES AND PRESSURE - fields={'vx','vy','vz','pressure','basalforcings.geothermalflux'}; + fields={'initialization.vx','initialization.vy','initialization.vz','initialization.pressure','basalforcings.geothermalflux'}; checksize(md,fields,[md.numberofnodes 1]); checknan(md,fields); @@ -555,10 +555,10 @@ %INITIAL TEMPERATURE, MELTING, ACCUMULATION AND WATERFRACTION - fields={'temperature','basalforcings.melting_rate','waterfraction'}; + fields={'initialization.temperature','basalforcings.melting_rate','initialization.waterfraction'}; checksize(md,fields,[md.numberofnodes 1]); checknan(md,fields); %INITIAL TEMPERATURE - fields={'temperature'}; + fields={'initialization.temperature'}; checkgreater(md,fields,0) end @@ -571,10 +571,10 @@ % {{{2 %VELOCITIES MELTING AND ACCUMULATION - fields={'vx','vy','basalforcings.melting_rate','balancethickness.thickening_rate'}; + fields={'initialization.vx','initialization.vy','basalforcings.melting_rate','balancethickness.thickening_rate'}; checksize(md,fields,[md.numberofnodes 1]); checknan(md,fields); %Triangle with zero velocity - if any(sum(abs(md.vx(md.elements)),2)==0 & sum(abs(md.vy(md.elements)),2)==0) + if any(sum(abs(md.initialization.vx(md.elements)),2)==0 & sum(abs(md.initialization.vy(md.elements)),2)==0) message('model not consistent: at least one triangle has all its vertices with a zero velocity'); end Index: /issm/trunk/src/m/model/mechanicalproperties.m =================================================================== --- /issm/trunk/src/m/model/mechanicalproperties.m (revision 9683) +++ /issm/trunk/src/m/model/mechanicalproperties.m (revision 9684) @@ -10,5 +10,5 @@ % % Example: -% md=mechanicalproperties(md,md.vx,md.vy); +% md=mechanicalproperties(md,md.initialization.vx,md.initialization.vy); % md=mechanicalproperties(md,md.inversion.vx_obs,md.inversion.vy_obs); Index: /issm/trunk/src/m/model/mesh/meshadaptation.m =================================================================== --- /issm/trunk/src/m/model/mesh/meshadaptation.m (revision 9683) +++ /issm/trunk/src/m/model/mesh/meshadaptation.m (revision 9684) @@ -11,5 +11,5 @@ % % Example: -% md2=meshadaptation(md,md.vel,1.2,0.5,1); +% md2=meshadaptation(md,md.initialization.vel,1.2,0.5,1); %some checks Index: /issm/trunk/src/m/model/misfit.m =================================================================== --- /issm/trunk/src/m/model/misfit.m (revision 9683) +++ /issm/trunk/src/m/model/misfit.m (revision 9684) @@ -13,6 +13,6 @@ x=md.x; y=md.y; - vx=md.vx; - vy=md.vy; + vx=md.initialization.vx; + vy=md.initialization.vy; vx_obs=md.inversion.vx_obs; vy_obs=md.inversion.vy_obs; @@ -21,6 +21,6 @@ x=md.x2d; y=md.y2d; - vx=project2d(md,md.vx,md.numlayers); - vy=project2d(md,md.vy,md.numlayers); + vx=project2d(md,md.initialization.vx,md.numlayers); + vy=project2d(md,md.initialization.vy,md.numlayers); vx_obs=project2d(md,md.inversion.vx_obs,md.numlayers); vy_obs=project2d(md,md.inversion.vy_obs,md.numlayers); Index: /issm/trunk/src/m/model/outflow.m =================================================================== --- /issm/trunk/src/m/model/outflow.m (revision 9683) +++ /issm/trunk/src/m/model/outflow.m (revision 9684) @@ -9,6 +9,6 @@ Nx=-(md.y(A)-md.y(B)); Ny= md.x(A)-md.x(B); -Vx=(md.vx(A)+md.vx(B))/2; -Vy=(md.vy(A)+md.vy(B))/2; +Vx=(md.initialization.vx(A)+md.initialization.vx(B))/2; +Vy=(md.initialization.vy(A)+md.initialization.vy(B))/2; %dot product Index: /issm/trunk/src/m/model/plot/plot_basaldrag.m =================================================================== --- /issm/trunk/src/m/model/plot/plot_basaldrag.m (revision 9683) +++ /issm/trunk/src/m/model/plot/plot_basaldrag.m (revision 9684) @@ -22,9 +22,9 @@ %compute horizontal velocity if strcmpi(type,'basal_drag') - ub=sqrt(md.vx.^2+md.vy.^2)/md.constants.yts; + ub=sqrt(md.initialization.vx.^2+md.initialization.vy.^2)/md.constants.yts; elseif strcmpi(type,'basal_dragx') - ub=md.vx/md.constants.yts; + ub=md.initialization.vx/md.constants.yts; elseif strcmpi(type,'basal_dragy') - ub=md.vy/md.constants.yts; + ub=md.initialization.vy/md.constants.yts; end Index: /issm/trunk/src/m/model/plot/plot_manager.m =================================================================== --- /issm/trunk/src/m/model/plot/plot_manager.m (revision 9683) +++ /issm/trunk/src/m/model/plot/plot_manager.m (revision 9684) @@ -117,5 +117,5 @@ case 'quiver' - data=[md.vx md.vy]; %Go ahead and try plot_unit + data=[md.initialization.vx md.initialization.vy]; %Go ahead and try plot_unit case {'strainrate_tensor','strainrate','strainrate_principal','strainrate_principalaxis1','strainrate_principalaxis2','strainrate_principalaxis3',... Index: /issm/trunk/src/m/model/plot/plot_quiver.m =================================================================== --- /issm/trunk/src/m/model/plot/plot_quiver.m (revision 9683) +++ /issm/trunk/src/m/model/plot/plot_quiver.m (revision 9684) @@ -8,5 +8,5 @@ % % Example: -% plot_quiver(md.x,md.y,md.vx,md.vy,options); +% plot_quiver(md.x,md.y,md.initialization.vx,md.initialization.vy,options); %process fields Index: /issm/trunk/src/m/model/plot/plot_quiver3.m =================================================================== --- /issm/trunk/src/m/model/plot/plot_quiver3.m (revision 9683) +++ /issm/trunk/src/m/model/plot/plot_quiver3.m (revision 9684) @@ -8,5 +8,5 @@ % % Example: -% plot_quiver(md.x,md.y,md.z,md.vx,md.vy,md.vz,options); +% plot_quiver(md.x,md.y,md.z,md.initialization.vx,md.initialization.vy,md.initialization.vz,options); %keep only non NaN elements Index: /issm/trunk/src/m/model/plot/plot_riftnumbering.m =================================================================== --- /issm/trunk/src/m/model/plot/plot_riftnumbering.m (revision 9683) +++ /issm/trunk/src/m/model/plot/plot_riftnumbering.m (revision 9684) @@ -40,8 +40,8 @@ normal(2)=penaltypairs(j,6); - vx1=md.vx(penaltypairs(j,1)); - vx2=md.vx(penaltypairs(j,2)); - vy1=md.vy(penaltypairs(j,1)); - vy2=md.vy(penaltypairs(j,2)); + vx1=md.initialization.vx(penaltypairs(j,1)); + vx2=md.initialization.vx(penaltypairs(j,2)); + vy1=md.initialization.vy(penaltypairs(j,1)); + vy2=md.initialization.vy(penaltypairs(j,2)); penetration=(vx2-vx1)*normal(1)+(vy2-vy1)*normal(2); %if penetration is negative, plot in black, positive, plot in red;: ie: if rift is closing, black, if rift is opening, red. Index: /issm/trunk/src/m/model/plot/plot_riftpenetration.m =================================================================== --- /issm/trunk/src/m/model/plot/plot_riftpenetration.m (revision 9683) +++ /issm/trunk/src/m/model/plot/plot_riftpenetration.m (revision 9684) @@ -39,8 +39,8 @@ normal(2)=penaltypairs(j,6); - vx1=md.vx(penaltypairs(j,1)); - vx2=md.vx(penaltypairs(j,2)); - vy1=md.vy(penaltypairs(j,1)); - vy2=md.vy(penaltypairs(j,2)); + vx1=md.initialization.vx(penaltypairs(j,1)); + vx2=md.initialization.vx(penaltypairs(j,2)); + vy1=md.initialization.vy(penaltypairs(j,1)); + vy2=md.initialization.vy(penaltypairs(j,2)); penetration=(vx2-vx1)*normal(1)+(vy2-vy1)*normal(2); %if penetration is negative, plot in black, positive, plot in red;: ie: if rift is closing, black, if rift is opening, red. Index: /issm/trunk/src/m/model/plot/plot_riftrelvel.m =================================================================== --- /issm/trunk/src/m/model/plot/plot_riftrelvel.m (revision 9683) +++ /issm/trunk/src/m/model/plot/plot_riftrelvel.m (revision 9684) @@ -8,5 +8,5 @@ %some checks -if (length(md.vx)~=md.numberofnodes | length(md.vy)~=md.numberofnodes), +if (length(md.initialization.vx)~=md.numberofnodes | length(md.initialization.vy)~=md.numberofnodes), error('plot_riftvel error message: vx and vy do not have the right size'), end @@ -17,6 +17,6 @@ %recover vx and vy: -vx=getfieldvalue(options,'riftrelvel_vx',md.vx); -vy=getfieldvalue(options,'riftrelvel_vy',md.vy); +vx=getfieldvalue(options,'riftrelvel_vx',md.initialization.vx); +vy=getfieldvalue(options,'riftrelvel_vy',md.initialization.vy); %set as NaN all velocities not on rifts Index: /issm/trunk/src/m/model/plot/plot_riftvel.m =================================================================== --- /issm/trunk/src/m/model/plot/plot_riftvel.m (revision 9683) +++ /issm/trunk/src/m/model/plot/plot_riftvel.m (revision 9684) @@ -8,5 +8,5 @@ %some checks -if (length(md.vx)~=md.numberofnodes | length(md.vy)~=md.numberofnodes), +if (length(md.initialization.vx)~=md.numberofnodes | length(md.initialization.vy)~=md.numberofnodes), error('plot_riftvel error message: vx and vy do not have the right size'), end @@ -21,6 +21,6 @@ for i=1:md.rifts.numrifts, penaltypairs=md.rifts.riftstruct(i).penaltypairs(:,[1 2]); - u(penaltypairs(:))=md.vx(penaltypairs(:)); - v(penaltypairs(:))=md.vy(penaltypairs(:)); + u(penaltypairs(:))=md.initialization.vx(penaltypairs(:)); + v(penaltypairs(:))=md.initialization.vy(penaltypairs(:)); end @@ -71,5 +71,5 @@ normal(2)=penaltypairs(j,6); - vx1=md.vx(penaltypairs(j,1)); vx2=md.vx(penaltypairs(j,2)); vy1=md.vy(penaltypairs(j,1)); vy2=md.vy(penaltypairs(j,2)); + vx1=md.initialization.vx(penaltypairs(j,1)); vx2=md.initialization.vx(penaltypairs(j,2)); vy1=md.initialization.vy(penaltypairs(j,1)); vy2=md.initialization.vy(penaltypairs(j,2)); penetration=(vx2-vx1)*normal(1)+(vy2-vy1)*normal(2); %if penetration is negative, plot in black, positive, plot in red;: ie: if rift is closing, black, if rift is opening, red. Index: /issm/trunk/src/m/model/plot/plot_streamlines.m =================================================================== --- /issm/trunk/src/m/model/plot/plot_streamlines.m (revision 9683) +++ /issm/trunk/src/m/model/plot/plot_streamlines.m (revision 9684) @@ -7,6 +7,6 @@ %process data and model [x y z index is2d isplanet]=processmesh(md,[],options); -[u datatype]=processdata(md,md.vx,options); -[v datatype]=processdata(md,md.vy,options); +[u datatype]=processdata(md,md.initialization.vx,options); +[v datatype]=processdata(md,md.initialization.vy,options); %some checks Index: /issm/trunk/src/m/model/plot/plotdoc.m =================================================================== --- /issm/trunk/src/m/model/plot/plotdoc.m (revision 9683) +++ /issm/trunk/src/m/model/plot/plotdoc.m (revision 9684) @@ -11,5 +11,5 @@ disp(' ''data'' : what we want to plot'); disp(' Available values for ''data'' are: '); -disp(' - any field of the model structure. ex: plot(md,''data'',''vel''), or plot(md,''data'',md.vel)'); +disp(' - any field of the model structure. ex: plot(md,''data'',''vel''), or plot(md,''data'',md.initialization.vel)'); disp(' - ''basal_drag'': plot the basal drag on the bed (in kPa)'); disp(' - ''basal_dragx'' or ''basal_dragy'' : plot a component of the basal drag on the bed (in kPa)'); Index: /issm/trunk/src/m/model/shear2d.m =================================================================== --- /issm/trunk/src/m/model/shear2d.m (revision 9683) +++ /issm/trunk/src/m/model/shear2d.m (revision 9684) @@ -11,8 +11,8 @@ summation=[1;1;1]; -sx=(md.vx(md.elements).*alpha)*summation; -uy=(md.vx(md.elements).*beta)*summation; -vx=(md.vy(md.elements).*alpha)*summation; -sy=(md.vy(md.elements).*beta)*summation; +sx=(md.initialization.vx(md.elements).*alpha)*summation; +uy=(md.initialization.vx(md.elements).*beta)*summation; +vx=(md.initialization.vy(md.elements).*alpha)*summation; +sy=(md.initialization.vy(md.elements).*beta)*summation; sxy=(uy+vx)/2; s=sqrt(sx.^2+sy.^2+sxy.^2+sx.*sy); Index: /issm/trunk/src/m/model/thicknessevolution.m =================================================================== --- /issm/trunk/src/m/model/thicknessevolution.m (revision 9683) +++ /issm/trunk/src/m/model/thicknessevolution.m (revision 9684) @@ -9,5 +9,5 @@ % dhdt=thicknessevolution(md) -if (length(md.vx)~=md.numberofnodes)|(length(md.vy)~=md.numberofnodes) +if (length(md.initialization.vx)~=md.numberofnodes)|(length(md.initialization.vy)~=md.numberofnodes) error(['thicknessevolution error message: vx and vy should have a length of ' num2str(md.numberofnodes)]) end @@ -15,6 +15,6 @@ %load some variables H=md.thickness; -vx=md.vx; -vy=md.vy; +vx=md.initialization.vx; +vy=md.initialization.vy; index=md.elements; Index: /issm/trunk/src/m/model/tres.m =================================================================== --- /issm/trunk/src/m/model/tres.m (revision 9683) +++ /issm/trunk/src/m/model/tres.m (revision 9684) @@ -11,26 +11,26 @@ if md.dim==2, if isfield(md.results.DiagnosticSolution,'VxAverage'), - md.vx=PatchToVec(md.results.DiagnosticSolution.VxAverage); + md.initialization.vx=PatchToVec(md.results.DiagnosticSolution.VxAverage); else - md.vx=PatchToVec(md.results.DiagnosticSolution.Vx); + md.initialization.vx=PatchToVec(md.results.DiagnosticSolution.Vx); end if isfield(md.results.DiagnosticSolution,'VyAverage'), - md.vy=PatchToVec(md.results.DiagnosticSolution.VyAverage); + md.initialization.vy=PatchToVec(md.results.DiagnosticSolution.VyAverage); else - md.vy=PatchToVec(md.results.DiagnosticSolution.Vy); + md.initialization.vy=PatchToVec(md.results.DiagnosticSolution.Vy); end else - md.vx=PatchToVec(md.results.DiagnosticSolution.Vx); - md.vy=PatchToVec(md.results.DiagnosticSolution.Vy); + md.initialization.vx=PatchToVec(md.results.DiagnosticSolution.Vx); + md.initialization.vy=PatchToVec(md.results.DiagnosticSolution.Vy); if isfield(md.results.DiagnosticSolution,'Vz'), - md.vz=PatchToVec(md.results.DiagnosticSolution.Vz); + md.initialization.vz=PatchToVec(md.results.DiagnosticSolution.Vz); else - md.vz=zeros(md.numberofnodes,1); + md.initialization.vz=zeros(md.numberofnodes,1); end end - md.vel=PatchToVec(md.results.DiagnosticSolution.Vel); + md.initialization.vel=PatchToVec(md.results.DiagnosticSolution.Vel); if isfield(md.results.DiagnosticSolution,'Pressure'), - md.pressure=PatchToVec(md.results.DiagnosticSolution.Pressure); + md.initialization.pressure=PatchToVec(md.results.DiagnosticSolution.Pressure); end if md.rifts.numrifts, @@ -76,13 +76,13 @@ clear results,results2; elseif strcmpi(string,'steadystate'), - md.vx=PatchToVec(md.results.SteadystateSolution.Vx); - md.vy=PatchToVec(md.results.SteadystateSolution.Vy); + md.initialization.vx=PatchToVec(md.results.SteadystateSolution.Vx); + md.initialization.vy=PatchToVec(md.results.SteadystateSolution.Vy); if isfield(md.results.SteadystateSolution,'Vz'), - md.vz=PatchToVec(md.results.SteadystateSolution.Vz); + md.initialization.vz=PatchToVec(md.results.SteadystateSolution.Vz); end - md.vel=PatchToVec(md.results.SteadystateSolution.Vel); - md.pressure=PatchToVec(md.results.SteadystateSolution.Pressure); - md.temperature=PatchToVec(md.results.SteadystateSolution.Temperature); + md.initialization.vel=PatchToVec(md.results.SteadystateSolution.Vel); + md.initialization.pressure=PatchToVec(md.results.SteadystateSolution.Pressure); + md.initialization.temperature=PatchToVec(md.results.SteadystateSolution.Temperature); md.basalforcings.melting_rate=PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate); @@ -94,8 +94,8 @@ elseif strcmpi(string,'thermal'), - md.temperature=PatchToVec(md.results.ThermalSolution.Temperature); + md.initialization.temperature=PatchToVec(md.results.ThermalSolution.Temperature); md.basalforcings.melting_rate=PatchToVec(md.results.ThermalSolution.BasalMeltingRate); elseif strcmpi(string,'hydrology'), - md.watercolumn=PatchToVec(md.results.HydrologySolution.Watercolumn); + md.initialization.watercolumn=PatchToVec(md.results.HydrologySolution.Watercolumn); else Index: /issm/trunk/src/m/utils/BC/SetIceSheetBC.m =================================================================== --- /issm/trunk/src/m/utils/BC/SetIceSheetBC.m (revision 9683) +++ /issm/trunk/src/m/utils/BC/SetIceSheetBC.m (revision 9684) @@ -57,7 +57,7 @@ md.prognostic.spcthickness=NaN*ones(md.numberofnodes,1); -if (length(md.temperature)==md.numberofnodes), +if (length(md.initialization.temperature)==md.numberofnodes), md.thermal.spctemperature=NaN*ones(md.numberofnodes,1); - pos=find(md.nodeonsurface); md.thermal.spctemperature(pos)=md.temperature(pos); %impose observed temperature on surface + pos=find(md.nodeonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface if (length(md.basalforcings.geothermalflux)~=md.numberofnodes), md.basalforcings.geothermalflux=50*10^-3*ones(md.numberofnodes,1); %50 mW/m^2 Index: /issm/trunk/src/m/utils/BC/SetIceShelfBC.m =================================================================== --- /issm/trunk/src/m/utils/BC/SetIceShelfBC.m (revision 9683) +++ /issm/trunk/src/m/utils/BC/SetIceShelfBC.m (revision 9684) @@ -90,7 +90,7 @@ md.balancethickness.spcthickness=NaN*ones(md.numberofnodes,1); -if (length(md.temperature)==md.numberofnodes), +if (length(md.initialization.temperature)==md.numberofnodes), md.thermal.spctemperature=NaN*ones(md.numberofnodes,1); - pos=find(md.nodeonsurface); md.thermal.spctemperature(pos)=md.temperature(pos); %impose observed temperature on surface + pos=find(md.nodeonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface if (length(md.basalforcings.geothermalflux)~=md.numberofnodes), md.basalforcings.geothermalflux=zeros(md.numberofnodes,1); Index: /issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m =================================================================== --- /issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m (revision 9683) +++ /issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m (revision 9684) @@ -100,7 +100,7 @@ md.prognostic.spcthickness=NaN*ones(md.numberofnodes,1); -if (length(md.temperature)==md.numberofnodes), +if (length(md.initialization.temperature)==md.numberofnodes), md.thermal.spctemperature=NaN*ones(md.numberofnodes,1); - pos=find(md.nodeonsurface); md.thermal.spctemperature(pos)=md.temperature(pos); %impose observed temperature on surface + pos=find(md.nodeonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface if (length(md.basalforcings.geothermalflux)~=md.numberofnodes), md.basalforcings.geothermalflux=zeros(md.numberofnodes,1); Index: /issm/trunk/src/m/utils/Exp/downstreamflowlines.m =================================================================== --- /issm/trunk/src/m/utils/Exp/downstreamflowlines.m (revision 9683) +++ /issm/trunk/src/m/utils/Exp/downstreamflowlines.m (revision 9684) @@ -10,5 +10,5 @@ % % Example: -% flowpath=downstreamflowlines(md.elements,md.x,md.y,md.vx,md.vy,x0,y0) +% flowpath=downstreamflowlines(md.elements,md.x,md.y,md.vx,md.initialization.vy,x0,y0) %check input size Index: /issm/trunk/src/m/utils/Exp/flowlines.m =================================================================== --- /issm/trunk/src/m/utils/Exp/flowlines.m (revision 9683) +++ /issm/trunk/src/m/utils/Exp/flowlines.m (revision 9684) @@ -10,5 +10,5 @@ % % Example: -% flowpath=flowlines(md.elements,md.x,md.y,md.vx,md.vy,x0,y0) +% flowpath=flowlines(md.elements,md.x,md.y,md.vx,md.initialization.vy,x0,y0) %check input size Index: /issm/trunk/src/m/utils/Interp/plugvelocities.m =================================================================== --- /issm/trunk/src/m/utils/Interp/plugvelocities.m (revision 9683) +++ /issm/trunk/src/m/utils/Interp/plugvelocities.m (revision 9684) @@ -38,4 +38,4 @@ md.inversion.vel_obs=sqrt(md.inversion.vx_obs.^2+md.inversion.vy_obs.^2); md.vx=md.inversion.vx_obs; -md.vy=md.inversion.vy_obs; -md.vel=md.inversion.vel_obs; +md.initialization.vy=md.inversion.vy_obs; +md.initialization.vel=md.inversion.vel_obs; Index: /issm/trunk/test/Miscellaneous/GJM_test1/SquareShelf.par =================================================================== --- /issm/trunk/test/Miscellaneous/GJM_test1/SquareShelf.par (revision 9683) +++ /issm/trunk/test/Miscellaneous/GJM_test1/SquareShelf.par (revision 9684) @@ -14,5 +14,5 @@ md.materials.rheology_B=paterson(md.observed_temperature); md.materials.rheology_n=3*ones(md.numberofelements,1); -md.temperature=md.observed_temperature; +md.initialization.temperature=md.observed_temperature; %Friction Index: /issm/trunk/test/NightlyRun/test1201.m =================================================================== --- /issm/trunk/test/NightlyRun/test1201.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test1201.m (revision 9684) @@ -14,6 +14,6 @@ disp(' initial velocity'); - md.vx=zeros(md.numberofnodes,1); - md.vy=-400*ones(md.numberofnodes,1); + md.initialization.vx=zeros(md.numberofnodes,1); + md.initialization.vy=-400*ones(md.numberofnodes,1); %Stabilization Index: /issm/trunk/test/NightlyRun/test1204.m =================================================================== --- /issm/trunk/test/NightlyRun/test1204.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test1204.m (revision 9684) @@ -18,6 +18,6 @@ %plot results -md.vx=PatchToVec(md.results.DiagnosticSolution.Vx); -md.vy=PatchToVec(md.results.DiagnosticSolution.Vy); +md.initialization.vx=PatchToVec(md.results.DiagnosticSolution.Vx); +md.initialization.vy=PatchToVec(md.results.DiagnosticSolution.Vy); md.timestepping.time_step=1; Index: /issm/trunk/test/NightlyRun/test1301.m =================================================================== --- /issm/trunk/test/NightlyRun/test1301.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test1301.m (revision 9684) @@ -13,9 +13,9 @@ %Some conditions specific to melting test -md.pressure=zeros(md.numberofnodes,1); -md.temperature=273.15*ones(md.numberofnodes,1); +md.initialization.pressure=zeros(md.numberofnodes,1); +md.initialization.temperature=273.15*ones(md.numberofnodes,1); pos=find(md.nodeonsurface); -md.thermal.spctemperature(pos)=md.temperature(pos); -md.materials.rheology_B=paterson(md.temperature); +md.thermal.spctemperature(pos)=md.initialization.temperature(pos); +md.materials.rheology_B=paterson(md.initialization.temperature); %analytical results Index: /issm/trunk/test/NightlyRun/test1302.m =================================================================== --- /issm/trunk/test/NightlyRun/test1302.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test1302.m (revision 9684) @@ -14,7 +14,7 @@ pos1=find(md.elementonbed); md.thermal.spctemperature(md.elements(pos1,1:3))=10; pos2=find(md.elementonsurface); md.thermal.spctemperature(md.elements(pos2,4:6))=0; -md.vz=0.1*ones(md.numberofnodes,1); -md.vel=sqrt( md.vx.^2+ md.vy.^2+ md.vz.^2); -md.pressure=zeros(md.numberofnodes,1); +md.initialization.vz=0.1*ones(md.numberofnodes,1); +md.initialization.vel=sqrt( md.initialization.vx.^2+ md.initialization.vy.^2+ md.initialization.vz.^2); +md.initialization.pressure=zeros(md.numberofnodes,1); %analytical results @@ -23,5 +23,5 @@ A=10/(exp(alpha*(-1000))-1); %A=T(bed)/(exp(alpha*bed)-1) with bed=-1000 T(bed)=10 B=-A; -md.temperature=A*exp(alpha*md.z)+B; +md.initialization.temperature=A*exp(alpha*md.z)+B; %modeled results @@ -32,8 +32,8 @@ comp_temp=zeros(md.numberofnodes,1); comp_temp(md.results.ThermalSolution.Temperature.index)=md.results.ThermalSolution.Temperature.value; -relative=abs((comp_temp-md.temperature)./md.temperature)*100; -relative(find(comp_temp==md.temperature))=0; +relative=abs((comp_temp-md.initialization.temperature)./md.initialization.temperature)*100; +relative(find(comp_temp==md.initialization.temperature))=0; plotmodel(md,'data',comp_temp,'title','Modeled temperature [K]','data','temperature','view',3,... - 'title','Analytical temperature [K]','view',3,'data',comp_temp-md.temperature,... + 'title','Analytical temperature [K]','view',3,'data',comp_temp-md.initialization.temperature,... 'title','Absolute error [K]','view',3,'data',relative,'title','Relative error [%]','view',3,... 'figposition','mathieu','FontSize#all',20) Index: /issm/trunk/test/NightlyRun/test1303.m =================================================================== --- /issm/trunk/test/NightlyRun/test1303.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test1303.m (revision 9684) @@ -13,10 +13,10 @@ pos1=find(md.elementonbed); md.thermal.spctemperature(md.elements(pos1,1:3))=10; pos2=find(md.elementonsurface); md.thermal.spctemperature(md.elements(pos2,4:6))=0; -md.pressure=zeros(md.numberofnodes,1); +md.initialization.pressure=zeros(md.numberofnodes,1); %analytical results %d2T/dz2=0 T(bed)=10 T(surface)=0 => T=0*(z-bed)/thickness+10*(surface-z)/thickness %each layer of the 3d mesh must have a constant value -md.temperature=10*(md.surface-md.z)./md.thickness; +md.initialization.temperature=10*(md.surface-md.z)./md.thickness; %modeled results @@ -27,8 +27,8 @@ comp_temp=zeros(md.numberofnodes,1); comp_temp(md.results.ThermalSolution.Temperature.index)=md.results.ThermalSolution.Temperature.value; -relative=abs((comp_temp-md.temperature)./md.temperature)*100; -relative(find(comp_temp==md.temperature))=0; +relative=abs((comp_temp-md.initialization.temperature)./md.initialization.temperature)*100; +relative(find(comp_temp==md.initialization.temperature))=0; plotmodel(md,'data',comp_temp,'title','Modeled temperature [K]','data','temperature','view',3,... - 'title','Analytical temperature [K]','view',3,'data',comp_temp-md.temperature,... + 'title','Analytical temperature [K]','view',3,'data',comp_temp-md.initialization.temperature,... 'title','Absolute error [K]','view',3,'data',relative,'title','Relative error [%]','view',3,... 'figposition','mathieu','FontSize#all',20) Index: /issm/trunk/test/NightlyRun/test1304.m =================================================================== --- /issm/trunk/test/NightlyRun/test1304.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test1304.m (revision 9684) @@ -13,5 +13,5 @@ pos2=find(md.elementonsurface); md.thermal.spctemperature(md.elements(pos2,4:6))=0; -md.pressure=zeros(md.numberofnodes,1); +md.initialization.pressure=zeros(md.numberofnodes,1); md.basalforcings.geothermalflux(:)=0.1; %100mW/m^2 @@ -19,5 +19,5 @@ %the result is linear with depth and is equal to 0 on the upper surface (See BC) %d2T/dz2=0 -k*dT/dz(bed)=G T(surface)=0 => T=-G/k*(z-surface) -md.temperature=-0.1/md.thermalconductivity*(md.z-md.surface); %G=0.1 W/m2 +md.initialization.temperature=-0.1/md.thermalconductivity*(md.z-md.surface); %G=0.1 W/m2 %modeled results @@ -28,8 +28,8 @@ comp_temp=zeros(md.numberofnodes,1); comp_temp(md.results.ThermalSolution.Temperature.index)=md.results.ThermalSolution.Temperature.value; -relative=abs((comp_temp-md.temperature)./md.temperature)*100; -relative(find(comp_temp==md.temperature))=0; +relative=abs((comp_temp-md.initialization.temperature)./md.initialization.temperature)*100; +relative(find(comp_temp==md.initialization.temperature))=0; plotmodel(md,'data',comp_temp,'title','Modeled temperature [K]','data','temperature','view',3,... - 'title','Analytical temperature','view',3,'data',comp_temp-md.temperature,... + 'title','Analytical temperature','view',3,'data',comp_temp-md.initialization.temperature,... 'title','Absolute error [K]','view',3,'data',relative,'title','Relative error [%]','view',3,... 'figposition','mathieu','FontSize#all',20) Index: /issm/trunk/test/NightlyRun/test135.m =================================================================== --- /issm/trunk/test/NightlyRun/test135.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test135.m (revision 9684) @@ -4,5 +4,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md.balancethickness.stabilization=3; -md.vy=md.vy+400; +md.initialization.vy=md.initialization.vy+400; md=setflowequation(md,'macayeal','all'); md.cluster=none; Index: /issm/trunk/test/NightlyRun/test136.m =================================================================== --- /issm/trunk/test/NightlyRun/test136.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test136.m (revision 9684) @@ -4,5 +4,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md.balancethickness.stabilization=3; -md.vy=md.vy+400; +md.initialization.vy=md.initialization.vy+400; md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk/test/NightlyRun/test223.m =================================================================== --- /issm/trunk/test/NightlyRun/test223.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test223.m (revision 9684) @@ -15,5 +15,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=none; Index: /issm/trunk/test/NightlyRun/test224.m =================================================================== --- /issm/trunk/test/NightlyRun/test224.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test224.m (revision 9684) @@ -15,5 +15,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk/test/NightlyRun/test225.m =================================================================== --- /issm/trunk/test/NightlyRun/test225.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test225.m (revision 9684) @@ -16,5 +16,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=none; Index: /issm/trunk/test/NightlyRun/test226.m =================================================================== --- /issm/trunk/test/NightlyRun/test226.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test226.m (revision 9684) @@ -16,5 +16,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk/test/NightlyRun/test227.m =================================================================== --- /issm/trunk/test/NightlyRun/test227.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test227.m (revision 9684) @@ -16,5 +16,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=none; Index: /issm/trunk/test/NightlyRun/test228.m =================================================================== --- /issm/trunk/test/NightlyRun/test228.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test228.m (revision 9684) @@ -16,5 +16,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk/test/NightlyRun/test229.m =================================================================== --- /issm/trunk/test/NightlyRun/test229.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test229.m (revision 9684) @@ -16,5 +16,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=none; Index: /issm/trunk/test/NightlyRun/test230.m =================================================================== --- /issm/trunk/test/NightlyRun/test230.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test230.m (revision 9684) @@ -16,5 +16,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk/test/NightlyRun/test233.m =================================================================== --- /issm/trunk/test/NightlyRun/test233.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test233.m (revision 9684) @@ -26,12 +26,12 @@ %Initial velocity and pressure -md.vx=zeros(md.numberofnodes,1); -md.vy=zeros(md.numberofnodes,1); -md.vz=zeros(md.numberofnodes,1); -md.pressure=zeros(md.numberofnodes,1); +md.initialization.vx=zeros(md.numberofnodes,1); +md.initialization.vy=zeros(md.numberofnodes,1); +md.initialization.vz=zeros(md.numberofnodes,1); +md.initialization.pressure=zeros(md.numberofnodes,1); %Materials -md.temperature=(273-20)*ones(md.numberofnodes,1); -md.materials.rheology_B=paterson(md.temperature); +md.initialization.temperature=(273-20)*ones(md.numberofnodes,1); +md.materials.rheology_B=paterson(md.initialization.temperature); md.materials.rheology_n=3*ones(md.numberofelements,1); Index: /issm/trunk/test/NightlyRun/test234.m =================================================================== --- /issm/trunk/test/NightlyRun/test234.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test234.m (revision 9684) @@ -26,12 +26,12 @@ %Initial velocity and pressure -md.vx=zeros(md.numberofnodes,1); -md.vy=zeros(md.numberofnodes,1); -md.vz=zeros(md.numberofnodes,1); -md.pressure=zeros(md.numberofnodes,1); +md.initialization.vx=zeros(md.numberofnodes,1); +md.initialization.vy=zeros(md.numberofnodes,1); +md.initialization.vz=zeros(md.numberofnodes,1); +md.initialization.pressure=zeros(md.numberofnodes,1); %Materials -md.temperature=(273-20)*ones(md.numberofnodes,1); -md.materials.rheology_B=paterson(md.temperature); +md.initialization.temperature=(273-20)*ones(md.numberofnodes,1); +md.materials.rheology_B=paterson(md.initialization.temperature); md.materials.rheology_n=3*ones(md.numberofelements,1); Index: /issm/trunk/test/NightlyRun/test235.m =================================================================== --- /issm/trunk/test/NightlyRun/test235.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test235.m (revision 9684) @@ -23,12 +23,12 @@ %Initial velocity and pressure -md.vx=zeros(md.numberofnodes,1); -md.vy=zeros(md.numberofnodes,1); -md.vz=zeros(md.numberofnodes,1); -md.pressure=zeros(md.numberofnodes,1); +md.initialization.vx=zeros(md.numberofnodes,1); +md.initialization.vy=zeros(md.numberofnodes,1); +md.initialization.vz=zeros(md.numberofnodes,1); +md.initialization.pressure=zeros(md.numberofnodes,1); %Materials -md.temperature=(273-20)*ones(md.numberofnodes,1); -md.materials.rheology_B=paterson(md.temperature); +md.initialization.temperature=(273-20)*ones(md.numberofnodes,1); +md.materials.rheology_B=paterson(md.initialization.temperature); md.materials.rheology_n=3*ones(md.numberofelements,1); Index: /issm/trunk/test/NightlyRun/test236.m =================================================================== --- /issm/trunk/test/NightlyRun/test236.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test236.m (revision 9684) @@ -23,12 +23,12 @@ %Initial velocity and pressure -md.vx=zeros(md.numberofnodes,1); -md.vy=zeros(md.numberofnodes,1); -md.vz=zeros(md.numberofnodes,1); -md.pressure=zeros(md.numberofnodes,1); +md.initialization.vx=zeros(md.numberofnodes,1); +md.initialization.vy=zeros(md.numberofnodes,1); +md.initialization.vz=zeros(md.numberofnodes,1); +md.initialization.pressure=zeros(md.numberofnodes,1); %Materials -md.temperature=(273-20)*ones(md.numberofnodes,1); -md.materials.rheology_B=paterson(md.temperature); +md.initialization.temperature=(273-20)*ones(md.numberofnodes,1); +md.materials.rheology_B=paterson(md.initialization.temperature); md.materials.rheology_n=3*ones(md.numberofelements,1); Index: /issm/trunk/test/NightlyRun/test337.m =================================================================== --- /issm/trunk/test/NightlyRun/test337.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test337.m (revision 9684) @@ -15,5 +15,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=none; Index: /issm/trunk/test/NightlyRun/test338.m =================================================================== --- /issm/trunk/test/NightlyRun/test338.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test338.m (revision 9684) @@ -15,5 +15,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk/test/NightlyRun/test339.m =================================================================== --- /issm/trunk/test/NightlyRun/test339.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test339.m (revision 9684) @@ -16,5 +16,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=none; Index: /issm/trunk/test/NightlyRun/test340.m =================================================================== --- /issm/trunk/test/NightlyRun/test340.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test340.m (revision 9684) @@ -16,5 +16,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk/test/NightlyRun/test341.m =================================================================== --- /issm/trunk/test/NightlyRun/test341.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test341.m (revision 9684) @@ -16,5 +16,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=none; Index: /issm/trunk/test/NightlyRun/test342.m =================================================================== --- /issm/trunk/test/NightlyRun/test342.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test342.m (revision 9684) @@ -16,5 +16,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk/test/NightlyRun/test343.m =================================================================== --- /issm/trunk/test/NightlyRun/test343.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test343.m (revision 9684) @@ -16,5 +16,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=none; Index: /issm/trunk/test/NightlyRun/test344.m =================================================================== --- /issm/trunk/test/NightlyRun/test344.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test344.m (revision 9684) @@ -16,5 +16,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk/test/NightlyRun/test429.m =================================================================== --- /issm/trunk/test/NightlyRun/test429.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test429.m (revision 9684) @@ -17,5 +17,5 @@ md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); md.timestepping.time_step=0; -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=none; Index: /issm/trunk/test/NightlyRun/test430.m =================================================================== --- /issm/trunk/test/NightlyRun/test430.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test430.m (revision 9684) @@ -17,5 +17,5 @@ md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); md.timestepping.time_step=0; -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk/test/NightlyRun/test431.m =================================================================== --- /issm/trunk/test/NightlyRun/test431.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test431.m (revision 9684) @@ -17,5 +17,5 @@ md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); md.timestepping.time_step=0; -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=none; Index: /issm/trunk/test/NightlyRun/test432.m =================================================================== --- /issm/trunk/test/NightlyRun/test432.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test432.m (revision 9684) @@ -17,5 +17,5 @@ md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1); md.timestepping.time_step=0; -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk/test/NightlyRun/test521.m =================================================================== --- /issm/trunk/test/NightlyRun/test521.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test521.m (revision 9684) @@ -21,5 +21,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=none; Index: /issm/trunk/test/NightlyRun/test522.m =================================================================== --- /issm/trunk/test/NightlyRun/test522.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test522.m (revision 9684) @@ -21,5 +21,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk/test/NightlyRun/test523.m =================================================================== --- /issm/trunk/test/NightlyRun/test523.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test523.m (revision 9684) @@ -16,5 +16,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=none; Index: /issm/trunk/test/NightlyRun/test524.m =================================================================== --- /issm/trunk/test/NightlyRun/test524.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test524.m (revision 9684) @@ -16,5 +16,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk/test/NightlyRun/test525.m =================================================================== --- /issm/trunk/test/NightlyRun/test525.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test525.m (revision 9684) @@ -16,5 +16,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.timestepping.time_step=0; Index: /issm/trunk/test/NightlyRun/test526.m =================================================================== --- /issm/trunk/test/NightlyRun/test526.m (revision 9683) +++ /issm/trunk/test/NightlyRun/test526.m (revision 9684) @@ -16,5 +16,5 @@ md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); -md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy; +md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.timestepping.time_step=0; Index: /issm/trunk/test/Par/79North.par =================================================================== --- /issm/trunk/test/Par/79North.par (revision 9683) +++ /issm/trunk/test/Par/79North.par (revision 9684) @@ -3,6 +3,6 @@ %Geometry and observation load('../Data/79North.data','-mat'); -md.vx =InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y); -md.vy =InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y); +md.initialization.vx =InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y); +md.initialization.vy =InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y); md.surface =InterpFromMeshToMesh2d(index,x,y,surface,md.x,md.y); md.thickness=InterpFromMeshToMesh2d(index,x,y,thickness,md.x,md.y); @@ -11,6 +11,6 @@ %Materials -md.temperature=(273-20)*ones(md.numberofnodes,1); -md.materials.rheology_B=paterson(md.temperature); +md.initialization.temperature=(273-20)*ones(md.numberofnodes,1); +md.materials.rheology_B=paterson(md.initialization.temperature); md.materials.rheology_n=3*ones(md.numberofelements,1); Index: /issm/trunk/test/Par/ISMIPF.par =================================================================== --- /issm/trunk/test/Par/ISMIPF.par (revision 9683) +++ /issm/trunk/test/Par/ISMIPF.par (revision 9684) @@ -22,10 +22,10 @@ md=SetIceSheetBC(md); md.diagnostic.spcvx=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); +md.initialization.vx=zeros(md.numberofnodes,1); +md.initialization.vy=zeros(md.numberofnodes,1); +md.initialization.vz=zeros(md.numberofnodes,1); +md.initialization.vel=zeros(md.numberofnodes,1); +md.initialization.pressure=zeros(md.numberofnodes,1); +md.initialization.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.balancethickness.spcthickness=NaN*ones(md.numberofnodes,1); Index: /issm/trunk/test/Par/Pig.par =================================================================== --- /issm/trunk/test/Par/Pig.par (revision 9683) +++ /issm/trunk/test/Par/Pig.par (revision 9684) @@ -9,14 +9,14 @@ md.bed=md.surface-md.thickness; clear surface thickness vx_obs vy_obs x y index; -md.vx=md.inversion.vx_obs; -md.vy=md.inversion.vy_obs; -md.vz=zeros(md.numberofnodes,1); -md.pressure=zeros(md.numberofnodes,1); +md.initialization.vx=md.inversion.vx_obs; +md.initialization.vy=md.inversion.vy_obs; +md.initialization.vz=zeros(md.numberofnodes,1); +md.initialization.pressure=zeros(md.numberofnodes,1); %Materials -md.temperature=(273-20)*ones(md.numberofnodes,1); -md.materials.rheology_B=paterson(md.temperature); +md.initialization.temperature=(273-20)*ones(md.numberofnodes,1); +md.materials.rheology_B=paterson(md.initialization.temperature); md.materials.rheology_n=3*ones(md.numberofelements,1); -md.temperature=md.temperature; +md.initialization.temperature=md.initialization.temperature; %Friction Index: /issm/trunk/test/Par/RoundSheetEISMINT.par =================================================================== --- /issm/trunk/test/Par/RoundSheetEISMINT.par (revision 9683) +++ /issm/trunk/test/Par/RoundSheetEISMINT.par (revision 9684) @@ -14,5 +14,5 @@ st=1.67*10^-2/1000; %k/m; radius=sqrt((md.x).^2+(md.y).^2); -md.temperature=(tmin+st*radius); +md.initialization.temperature=(tmin+st*radius); md.basalforcings.geothermalflux=4.2*10^-2*ones(md.numberofnodes,1); @@ -32,8 +32,8 @@ md.inversion.vy_obs=constant/2*md.y.*(md.thickness).^-1; md.inversion.vel_obs=(sqrt((md.inversion.vx_obs).^2+(md.inversion.vy_obs).^2)); -md.vx=zeros(md.numberofnodes,1); -md.vy=zeros(md.numberofnodes,1); -md.vz=zeros(md.numberofnodes,1); -md.pressure=zeros(md.numberofnodes,1); +md.initialization.vx=zeros(md.numberofnodes,1); +md.initialization.vy=zeros(md.numberofnodes,1); +md.initialization.vz=zeros(md.numberofnodes,1); +md.initialization.pressure=zeros(md.numberofnodes,1); %Deal with boundary conditions: Index: /issm/trunk/test/Par/RoundSheetShelf.par =================================================================== --- /issm/trunk/test/Par/RoundSheetShelf.par (revision 9683) +++ /issm/trunk/test/Par/RoundSheetShelf.par (revision 9684) @@ -34,12 +34,12 @@ %Initial velocity -md.vx=zeros(md.numberofnodes,1); -md.vy=zeros(md.numberofnodes,1); -md.vz=zeros(md.numberofnodes,1); -md.pressure=zeros(md.numberofnodes,1); +md.initialization.vx=zeros(md.numberofnodes,1); +md.initialization.vy=zeros(md.numberofnodes,1); +md.initialization.vz=zeros(md.numberofnodes,1); +md.initialization.pressure=zeros(md.numberofnodes,1); %Materials -md.temperature=(273-20)*ones(md.numberofnodes,1); -md.materials.rheology_B=paterson(md.temperature); +md.initialization.temperature=(273-20)*ones(md.numberofnodes,1); +md.materials.rheology_B=paterson(md.initialization.temperature); md.materials.rheology_n=3*ones(md.numberofelements,1); Index: /issm/trunk/test/Par/RoundSheetStaticEISMINT.par =================================================================== --- /issm/trunk/test/Par/RoundSheetStaticEISMINT.par (revision 9683) +++ /issm/trunk/test/Par/RoundSheetStaticEISMINT.par (revision 9684) @@ -19,5 +19,5 @@ tmin=238.15; %K st=1.67*10^-2/1000; %k/m; -md.temperature=(tmin+st*radius); +md.initialization.temperature=(tmin+st*radius); md.basalforcings.geothermalflux=4.2*10^-2*ones(md.numberofnodes,1); @@ -37,8 +37,8 @@ md.inversion.vy_obs=constant/2*md.y.*(md.thickness).^-1; md.inversion.vel_obs=(sqrt((md.inversion.vx_obs).^2+(md.inversion.vy_obs).^2)); -md.vx=zeros(md.numberofnodes,1); -md.vy=zeros(md.numberofnodes,1); -md.vz=zeros(md.numberofnodes,1); -md.pressure=zeros(md.numberofnodes,1); +md.initialization.vx=zeros(md.numberofnodes,1); +md.initialization.vy=zeros(md.numberofnodes,1); +md.initialization.vz=zeros(md.numberofnodes,1); +md.initialization.pressure=zeros(md.numberofnodes,1); %Deal with boundary conditions: Index: /issm/trunk/test/Par/SquareEISMINT.par =================================================================== --- /issm/trunk/test/Par/SquareEISMINT.par (revision 9683) +++ /issm/trunk/test/Par/SquareEISMINT.par (revision 9684) @@ -17,5 +17,5 @@ disp(' creating temperature'); -md.temperature=(273-20)*ones(md.numberofnodes,1); +md.initialization.temperature=(273-20)*ones(md.numberofnodes,1); disp(' creating flow law paramter'); Index: /issm/trunk/test/Par/SquareSheetConstrained.par =================================================================== --- /issm/trunk/test/Par/SquareSheetConstrained.par (revision 9683) +++ /issm/trunk/test/Par/SquareSheetConstrained.par (revision 9684) @@ -12,13 +12,13 @@ %Initial velocity load('../Data/SquareSheetConstrained.data','-mat'); -md.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y); -md.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y); +md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y); +md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y); clear vx vy x y index; -md.vz=zeros(md.numberofnodes,1); -md.pressure=zeros(md.numberofnodes,1); +md.initialization.vz=zeros(md.numberofnodes,1); +md.initialization.pressure=zeros(md.numberofnodes,1); %Materials -md.temperature=(273-20)*ones(md.numberofnodes,1); -md.materials.rheology_B=paterson(md.temperature); +md.initialization.temperature=(273-20)*ones(md.numberofnodes,1); +md.materials.rheology_B=paterson(md.initialization.temperature); md.materials.rheology_n=3*ones(md.numberofelements,1); Index: /issm/trunk/test/Par/SquareSheetShelf.par =================================================================== --- /issm/trunk/test/Par/SquareSheetShelf.par (revision 9683) +++ /issm/trunk/test/Par/SquareSheetShelf.par (revision 9684) @@ -15,13 +15,13 @@ %Initial velocity load('../Data/SquareSheetShelf.data','-mat'); -md.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y); -md.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y); +md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y); +md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y); clear vx vy x y index; -md.vz=zeros(md.numberofnodes,1); -md.pressure=zeros(md.numberofnodes,1); +md.initialization.vz=zeros(md.numberofnodes,1); +md.initialization.pressure=zeros(md.numberofnodes,1); %Materials -md.temperature=(273-20)*ones(md.numberofnodes,1); -md.materials.rheology_B=paterson(md.temperature); +md.initialization.temperature=(273-20)*ones(md.numberofnodes,1); +md.materials.rheology_B=paterson(md.initialization.temperature); md.materials.rheology_n=3*ones(md.numberofelements,1); Index: /issm/trunk/test/Par/SquareShelf.par =================================================================== --- /issm/trunk/test/Par/SquareShelf.par (revision 9683) +++ /issm/trunk/test/Par/SquareShelf.par (revision 9684) @@ -12,13 +12,13 @@ %Initial velocity and pressure load('../Data/SquareShelf.data','-mat'); -md.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y); -md.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y); +md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y); +md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y); clear vx vy x y index; -md.vz=zeros(md.numberofnodes,1); -md.pressure=zeros(md.numberofnodes,1); +md.initialization.vz=zeros(md.numberofnodes,1); +md.initialization.pressure=zeros(md.numberofnodes,1); %Materials -md.temperature=(273-20)*ones(md.numberofnodes,1); -md.materials.rheology_B=paterson(md.temperature); +md.initialization.temperature=(273-20)*ones(md.numberofnodes,1); +md.materials.rheology_B=paterson(md.initialization.temperature); md.materials.rheology_n=3*ones(md.numberofelements,1); Index: /issm/trunk/test/Par/SquareShelfConstrained.par =================================================================== --- /issm/trunk/test/Par/SquareShelfConstrained.par (revision 9683) +++ /issm/trunk/test/Par/SquareShelfConstrained.par (revision 9684) @@ -12,13 +12,13 @@ %Initial velocity load('../Data/SquareShelfConstrained.data','-mat'); -md.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y); -md.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y); +md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y); +md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y); clear vx vy x y index; -md.vz=zeros(md.numberofnodes,1); -md.pressure=zeros(md.numberofnodes,1); +md.initialization.vz=zeros(md.numberofnodes,1); +md.initialization.pressure=zeros(md.numberofnodes,1); %Materials -md.temperature=(273-20)*ones(md.numberofnodes,1); -md.materials.rheology_B=paterson(md.temperature); +md.initialization.temperature=(273-20)*ones(md.numberofnodes,1); +md.materials.rheology_B=paterson(md.initialization.temperature); md.materials.rheology_n=3*ones(md.numberofelements,1); Index: /issm/trunk/test/Par/SquareThermal.par =================================================================== --- /issm/trunk/test/Par/SquareThermal.par (revision 9683) +++ /issm/trunk/test/Par/SquareThermal.par (revision 9684) @@ -10,7 +10,7 @@ disp(' creating velocities'); -md.vx=zeros(md.numberofnodes,1); -md.vy=zeros(md.numberofnodes,1); -md.vz=zeros(md.numberofnodes,1); +md.initialization.vx=zeros(md.numberofnodes,1); +md.initialization.vy=zeros(md.numberofnodes,1); +md.initialization.vz=zeros(md.numberofnodes,1); disp(' creating drag'); @@ -23,8 +23,8 @@ disp(' creating temperatures'); -md.temperature=(273-20)*ones(md.numberofnodes,1); +md.initialization.temperature=(273-20)*ones(md.numberofnodes,1); disp(' creating flow law paramter'); -md.materials.rheology_B=paterson(md.temperature); +md.materials.rheology_B=paterson(md.initialization.temperature); md.materials.rheology_n=3*ones(md.numberofelements,1); @@ -39,5 +39,5 @@ disp(' boundary conditions for thermal model'); -md.thermal.spctemperature(:)=md.temperature; +md.thermal.spctemperature(:)=md.initialization.temperature; md.basalforcings.geothermalflux=zeros(md.numberofnodes,1); pos=find(md.mask.elementongroundedice);md.basalforcings.geothermalflux(md.elements(pos,:))=1*10^-3; %1 mW/m^2