Changeset 9684


Ignore:
Timestamp:
09/08/11 10:57:56 (14 years ago)
Author:
seroussi
Message:

added initialization class

Location:
issm/trunk
Files:
83 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/m/classes/model/model.m

    r9681 r9684  
    3636                 inversion        = modelfield('default',0,'marshall',true);
    3737                 transient        = modelfield('default',0,'marshall',true);
    38                  diagnostic = modelfield('default',0,'marshall',true);
     38                 diagnostic       = modelfield('default',0,'marshall',true);
     39                 initialization   = modelfield('default',0,'marshall',true);
    3940
    4041                 %FIXME: all other fields should belong to other classes
    … …  
    105106                 output_frequency               = modelfield('default',0,'marshall',true,'format','Integer');
    106107                 results_on_vertices            = modelfield('default',0,'marshall',true,'format','Boolean');
    107                  vx                             = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
    108                  vy                             = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
    109                  vz                             = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
    110                  vel                            = modelfield('default',NaN,'marshall',false);
    111                  temperature                    = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); %temperature solution vector
    112                  waterfraction                  = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
    113                  pressure                       = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
    114                  %Hydrology
    115                  watercolumn                    = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
    116108
    117109                 %Parallelisation
    … …  
    351343                         if isfield(structmd,'vel_obs'), md.inversion.vel_obs=structmd.vel_obs; end
    352344                         if isfield(structmd,'thickness_obs'), md.inversion.thickness_obs=structmd.thickness_obs; end
     345                         if isfield(structmd,'vx'), md.initialization.vx=structmd.vx; end
     346                         if isfield(structmd,'vy'), md.initialization.vy=structmd.vy; end
     347                         if isfield(structmd,'vz'), md.initialization.vz=structmd.vz; end
     348                         if isfield(structmd,'pressure'), md.initialization.pressure=structmd.pressure; end
     349                         if isfield(structmd,'temperature'), md.initialization.temperature=structmd.temperature; end
     350                         if isfield(structmd,'waterfraction'), md.initialization.waterfraction=structmd.waterfraction; end
     351                         if isfield(structmd,'watercolumn'), md.initialization.watercolumn=structmd.watercolumn; end
    353352
    354353                         %Field changes
    … …  
    478477                         md.inversion        = inversion;
    479478                         md.transient        = transient;
    480                          md.diagnostic=diagnostic;
     479                         md.diagnostic       =diagnostic;
     480                         md.initialization   =initialization;
    481481
    482482                         %Solver parameters

  • issm/trunk/src/m/model/DepthAverage.m

    r8298 r9684  
    66%
    77%   Example:
    8 %      vel_bar=DepthAverage(md,md.vel);
     8%      vel_bar=DepthAverage(md,md.initialization.vel);
    99
    1010%check that the model given in input is 3d

  • issm/trunk/src/m/model/averaging.m

    r8298 r9684  
    1313%
    1414%   Examples:
    15 %      velsmoothed=averaging(md,md.vel,4);
    16 %      pressure=averaging(md,md.pressure,0);
     15%      velsmoothed=averaging(md,md.initialization.vel,4);
     16%      pressure=averaging(md,md.initialization.pressure,0);
    1717
    1818if length(data)~=md.numberofelements & length(data)~=md.numberofnodes

  • issm/trunk/src/m/model/basalstress.m

    r9636 r9684  
    1313
    1414%compute horizontal velocity
    15 ub=sqrt(md.vx.^2+md.vy.^2)/md.constants.yts;
    16 ubx=md.vx/md.constants.yts;
    17 uby=md.vy/md.constants.yts;
     15ub=sqrt(md.initialization.vx.^2+md.initialization.vy.^2)/md.constants.yts;
     16ubx=md.initialization.vx/md.constants.yts;
     17uby=md.initialization.vy/md.constants.yts;
    1818
    1919%compute basal drag

  • issm/trunk/src/m/model/basevert.m

    r9636 r9684  
    2020end
    2121
    22 hu=md.thickness.*md.vx;
    23 hv=md.thickness.*md.vy;
     22hu=md.thickness.*md.initialization.vx;
     23hv=md.thickness.*md.initialization.vy;
    2424
    2525summation=[1;1;1];
    … …  
    2727hvy=(hv(md.elements).*beta)*summation;
    2828
    29 uelem=md.vx(md.elements)*summation/3;
    30 velem=md.vy(md.elements)*summation/3;
     29uelem=md.initialization.vx(md.elements)*summation/3;
     30velem=md.initialization.vy(md.elements)*summation/3;
    3131
    3232dbdx=(md.bed(md.elements).*alpha)*summation;

  • issm/trunk/src/m/model/collapse.m

    r9681 r9684  
    3535
    3636%results
    37 if ~isnan(md.vx),md.vx=DepthAverage(md,md.vx);end;
    38 if ~isnan(md.vy),md.vy=DepthAverage(md,md.vy);end;
    39 if ~isnan(md.vz),md.vz=DepthAverage(md,md.vz);end;
    40 if ~isnan(md.vel),md.vel=DepthAverage(md,md.vel);end;
     37if ~isnan(md.initialization.vx),md.initialization.vx=DepthAverage(md,md.initialization.vx);end;
     38if ~isnan(md.initialization.vy),md.initialization.vy=DepthAverage(md,md.initialization.vy);end;
     39if ~isnan(md.initialization.vz),md.initialization.vz=DepthAverage(md,md.initialization.vz);end;
     40if ~isnan(md.initialization.vel),md.initialization.vel=DepthAverage(md,md.initialization.vel);end;
    4141
    4242%bedinfo and surface info

  • issm/trunk/src/m/model/contourmassbalance.m

    r9679 r9684  
    1010        error('contourmassbalance error message: bad usage');
    1111end
    12 if ((length(md.vx)~=md.numberofnodes)|(length(md.vy)~=md.numberofnodes))
     12if ((length(md.initialization.vx)~=md.numberofnodes)|(length(md.initialization.vy)~=md.numberofnodes))
    1313        error(['thicknessevolution error message: vx and vy should have a length of ' num2str(md.numberofnodes)])
    1414end
    … …  
    2828x=md.x;
    2929y=md.y;
    30 vx=mean(md.vx(segments(:,1:end-1)),2);
    31 vy=mean(md.vy(segments(:,1:end-1)),2);
     30vx=mean(md.initialization.vx(segments(:,1:end-1)),2);
     31vy=mean(md.initialization.vy(segments(:,1:end-1)),2);
    3232H=mean(md.thickness(segments(:,1:end-1)),2);
    3333nx=cos(atan2((x(segments(:,1))-x(segments(:,2))) , (y(segments(:,2))-y(segments(:,1)))));

  • issm/trunk/src/m/model/extrude.m

    r9681 r9684  
    140140
    141141%results
    142 if ~isnan(md.vx),md.vx=project3d(md,'vector',md.vx,'type','node');end;
    143 if ~isnan(md.vy),md.vy=project3d(md,'vector',md.vy,'type','node');end;
    144 if ~isnan(md.vz),md.vz=project3d(md,'vector',md.vz,'type','node');end;
    145 if ~isnan(md.vel),md.vel=project3d(md,'vector',md.vel,'type','node');end;
    146 if ~isnan(md.temperature),md.temperature=project3d(md,'vector',md.temperature,'type','node');end;
    147 if ~isnan(md.waterfraction),md.waterfraction=project3d(md,'vector',md.waterfraction,'type','node');end;
     142if ~isnan(md.initialization.vx),md.initialization.vx=project3d(md,'vector',md.initialization.vx,'type','node');end;
     143if ~isnan(md.initialization.vy),md.initialization.vy=project3d(md,'vector',md.initialization.vy,'type','node');end;
     144if ~isnan(md.initialization.vz),md.initialization.vz=project3d(md,'vector',md.initialization.vz,'type','node');end;
     145if ~isnan(md.initialization.vel),md.initialization.vel=project3d(md,'vector',md.initialization.vel,'type','node');end;
     146if ~isnan(md.initialization.temperature),md.initialization.temperature=project3d(md,'vector',md.initialization.temperature,'type','node');end;
     147if ~isnan(md.initialization.waterfraction),md.initialization.waterfraction=project3d(md,'vector',md.initialization.waterfraction,'type','node');end;
    148148
    149149%bedinfo and surface info
    … …  
    212212
    213213%Put lithostatic pressure is there is an existing pressure
    214 if ~isnan(md.pressure),
    215         md.pressure=md.constants.g*md.materials.rho_ice*(md.surface-md.z);
     214if ~isnan(md.initialization.pressure),
     215        md.initialization.pressure=md.constants.g*md.materials.rho_ice*(md.surface-md.z);
    216216end
    217217

  • issm/trunk/src/m/model/ismodelselfconsistent.m

    r9681 r9684  
    398398
    399399                        %INITIAL VELOCITY
    400                         if ~isnan(md.vx) & ~isnan(md.vy),
    401                                 fields={'vx','vy'};
     400                        if ~isnan(md.initialization.vx) & ~isnan(md.initialization.vy),
     401                                fields={'initialization.vx','initialization.vy'};
    402402                                checknan(md,fields);
    403403                                checksize(md,fields,[md.numberofnodes 1]);
    … …  
    454454                        % {{{2
    455455                        %INITIAL VELOCITIES
    456                         fields={'vx','vy'};
     456                        fields={'initialization.vx','initialization.vy'};
    457457                        checksize(md,fields,[md.numberofnodes 1]);
    458458                        checknan(md,fields);
    … …  
    480480                        fields={'hydrology.spcwatercolumn'};
    481481                        checkforcing(md,fields);
    482                         fields={'watercolumn'};
     482                        fields={'initialization.watercolumn'};
    483483                        checksize(md,fields,[md.numberofnodes 1]);
    484484                        %}}}
    … …  
    504504
    505505                        %VELOCITIES AND PRESSURE
    506                         fields={'vx','vy','vz','pressure','basalforcings.geothermalflux'};
     506                        fields={'initialization.vx','initialization.vy','initialization.vz','initialization.pressure','basalforcings.geothermalflux'};
    507507                        checksize(md,fields,[md.numberofnodes 1]);
    508508                        checknan(md,fields);
    … …  
    516516
    517517                                %INITIAL TEMPERATURE, MELTING AND ACCUMULATION
    518                                 fields={'temperature','basalforcings.melting_rate'};
     518                                fields={'initialization.temperature','basalforcings.melting_rate'};
    519519                                checksize(md,fields,[md.numberofnodes 1]);
    520520                                checknan(md,fields);
    521521
    522522                                %INITIAL TEMPERATURE
    523                                 fields={'temperature'};
     523                                fields={'initialization.temperature'};
    524524                                checkgreater(md,fields,0)
    525525
    … …  
    543543
    544544                        %VELOCITIES AND PRESSURE
    545                         fields={'vx','vy','vz','pressure','basalforcings.geothermalflux'};
     545                        fields={'initialization.vx','initialization.vy','initialization.vz','initialization.pressure','basalforcings.geothermalflux'};
    546546                        checksize(md,fields,[md.numberofnodes 1]);
    547547                        checknan(md,fields);
    … …  
    555555
    556556                                %INITIAL TEMPERATURE, MELTING, ACCUMULATION AND WATERFRACTION
    557                                 fields={'temperature','basalforcings.melting_rate','waterfraction'};
     557                                fields={'initialization.temperature','basalforcings.melting_rate','initialization.waterfraction'};
    558558                                checksize(md,fields,[md.numberofnodes 1]);
    559559                                checknan(md,fields);
    560560
    561561                                %INITIAL TEMPERATURE
    562                                 fields={'temperature'};
     562                                fields={'initialization.temperature'};
    563563                                checkgreater(md,fields,0)
    564564                        end
    … …  
    571571                        % {{{2
    572572                        %VELOCITIES MELTING AND ACCUMULATION
    573                         fields={'vx','vy','basalforcings.melting_rate','balancethickness.thickening_rate'};
     573                        fields={'initialization.vx','initialization.vy','basalforcings.melting_rate','balancethickness.thickening_rate'};
    574574                        checksize(md,fields,[md.numberofnodes 1]);
    575575                        checknan(md,fields);
    576576
    577577                        %Triangle with zero velocity
    578                         if any(sum(abs(md.vx(md.elements)),2)==0 & sum(abs(md.vy(md.elements)),2)==0)
     578                        if any(sum(abs(md.initialization.vx(md.elements)),2)==0 & sum(abs(md.initialization.vy(md.elements)),2)==0)
    579579                                message('model not consistent: at least one triangle has all its vertices with a zero velocity');
    580580                        end

  • issm/trunk/src/m/model/mechanicalproperties.m

    r9681 r9684  
    1010%
    1111%   Example:
    12 %      md=mechanicalproperties(md,md.vx,md.vy);
     12%      md=mechanicalproperties(md,md.initialization.vx,md.initialization.vy);
    1313%      md=mechanicalproperties(md,md.inversion.vx_obs,md.inversion.vy_obs);
    1414

  • issm/trunk/src/m/model/mesh/meshadaptation.m

    r8298 r9684  
    1111%
    1212%   Example:
    13 %      md2=meshadaptation(md,md.vel,1.2,0.5,1);
     13%      md2=meshadaptation(md,md.initialization.vel,1.2,0.5,1);
    1414
    1515%some checks

  • issm/trunk/src/m/model/misfit.m

    r9681 r9684  
    1313        x=md.x;
    1414        y=md.y;
    15         vx=md.vx;
    16         vy=md.vy;
     15        vx=md.initialization.vx;
     16        vy=md.initialization.vy;
    1717        vx_obs=md.inversion.vx_obs;
    1818        vy_obs=md.inversion.vy_obs;
    … …  
    2121        x=md.x2d;
    2222        y=md.y2d;
    23         vx=project2d(md,md.vx,md.numlayers);
    24         vy=project2d(md,md.vy,md.numlayers);
     23        vx=project2d(md,md.initialization.vx,md.numlayers);
     24        vy=project2d(md,md.initialization.vy,md.numlayers);
    2525        vx_obs=project2d(md,md.inversion.vx_obs,md.numlayers);
    2626        vy_obs=project2d(md,md.inversion.vy_obs,md.numlayers);

  • issm/trunk/src/m/model/outflow.m

    r9626 r9684  
    99Nx=-(md.y(A)-md.y(B));
    1010Ny=  md.x(A)-md.x(B);
    11 Vx=(md.vx(A)+md.vx(B))/2;
    12 Vy=(md.vy(A)+md.vy(B))/2;
     11Vx=(md.initialization.vx(A)+md.initialization.vx(B))/2;
     12Vy=(md.initialization.vy(A)+md.initialization.vy(B))/2;
    1313
    1414%dot product

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

    r9636 r9684  
    2222%compute horizontal velocity
    2323if strcmpi(type,'basal_drag')
    24         ub=sqrt(md.vx.^2+md.vy.^2)/md.constants.yts;
     24        ub=sqrt(md.initialization.vx.^2+md.initialization.vy.^2)/md.constants.yts;
    2525elseif strcmpi(type,'basal_dragx')
    26         ub=md.vx/md.constants.yts;
     26        ub=md.initialization.vx/md.constants.yts;
    2727elseif strcmpi(type,'basal_dragy')
    28         ub=md.vy/md.constants.yts;
     28        ub=md.initialization.vy/md.constants.yts;
    2929end
    3030

  • issm/trunk/src/m/model/plot/plot_manager.m

    r8929 r9684  
    117117               
    118118                case 'quiver'
    119                         data=[md.vx md.vy]; %Go ahead and try plot_unit
     119                        data=[md.initialization.vx md.initialization.vy]; %Go ahead and try plot_unit
    120120
    121121                case {'strainrate_tensor','strainrate','strainrate_principal','strainrate_principalaxis1','strainrate_principalaxis2','strainrate_principalaxis3',...

  • issm/trunk/src/m/model/plot/plot_quiver.m

    r6287 r9684  
    88%
    99%   Example:
    10 %      plot_quiver(md.x,md.y,md.vx,md.vy,options);
     10%      plot_quiver(md.x,md.y,md.initialization.vx,md.initialization.vy,options);
    1111
    1212%process fields

  • issm/trunk/src/m/model/plot/plot_quiver3.m

    r2439 r9684  
    88%
    99%   Example:
    10 %      plot_quiver(md.x,md.y,md.z,md.vx,md.vy,md.vz,options);
     10%      plot_quiver(md.x,md.y,md.z,md.initialization.vx,md.initialization.vy,md.initialization.vz,options);
    1111
    1212%keep only non NaN elements

  • issm/trunk/src/m/model/plot/plot_riftnumbering.m

    r9619 r9684  
    4040                        normal(2)=penaltypairs(j,6);
    4141
    42                         vx1=md.vx(penaltypairs(j,1));
    43                         vx2=md.vx(penaltypairs(j,2));
    44                         vy1=md.vy(penaltypairs(j,1));
    45                         vy2=md.vy(penaltypairs(j,2));
     42                        vx1=md.initialization.vx(penaltypairs(j,1));
     43                        vx2=md.initialization.vx(penaltypairs(j,2));
     44                        vy1=md.initialization.vy(penaltypairs(j,1));
     45                        vy2=md.initialization.vy(penaltypairs(j,2));
    4646                        penetration=(vx2-vx1)*normal(1)+(vy2-vy1)*normal(2);
    4747                        %if penetration is negative, plot in black, positive, plot in red;: ie: if rift is closing, black, if rift is opening, red.

  • issm/trunk/src/m/model/plot/plot_riftpenetration.m

    r9619 r9684  
    3939                        normal(2)=penaltypairs(j,6);
    4040
    41                         vx1=md.vx(penaltypairs(j,1));
    42                         vx2=md.vx(penaltypairs(j,2));
    43                         vy1=md.vy(penaltypairs(j,1));
    44                         vy2=md.vy(penaltypairs(j,2));
     41                        vx1=md.initialization.vx(penaltypairs(j,1));
     42                        vx2=md.initialization.vx(penaltypairs(j,2));
     43                        vy1=md.initialization.vy(penaltypairs(j,1));
     44                        vy2=md.initialization.vy(penaltypairs(j,2));
    4545                        penetration=(vx2-vx1)*normal(1)+(vy2-vy1)*normal(2);
    4646                        %if penetration is negative, plot in black, positive, plot in red;: ie: if rift is closing, black, if rift is opening, red.

  • issm/trunk/src/m/model/plot/plot_riftrelvel.m

    r9619 r9684  
    88
    99%some checks
    10 if (length(md.vx)~=md.numberofnodes | length(md.vy)~=md.numberofnodes),
     10if (length(md.initialization.vx)~=md.numberofnodes | length(md.initialization.vy)~=md.numberofnodes),
    1111        error('plot_riftvel error message: vx and vy do not have the right size'),
    1212end
    … …  
    1717
    1818%recover vx and vy:
    19 vx=getfieldvalue(options,'riftrelvel_vx',md.vx);
    20 vy=getfieldvalue(options,'riftrelvel_vy',md.vy);
     19vx=getfieldvalue(options,'riftrelvel_vx',md.initialization.vx);
     20vy=getfieldvalue(options,'riftrelvel_vy',md.initialization.vy);
    2121
    2222%set as NaN all velocities not on rifts

  • issm/trunk/src/m/model/plot/plot_riftvel.m

    r9619 r9684  
    88
    99%some checks
    10 if (length(md.vx)~=md.numberofnodes | length(md.vy)~=md.numberofnodes),
     10if (length(md.initialization.vx)~=md.numberofnodes | length(md.initialization.vy)~=md.numberofnodes),
    1111        error('plot_riftvel error message: vx and vy do not have the right size'),
    1212end
    … …  
    2121for i=1:md.rifts.numrifts,
    2222        penaltypairs=md.rifts.riftstruct(i).penaltypairs(:,[1 2]);
    23         u(penaltypairs(:))=md.vx(penaltypairs(:));
    24         v(penaltypairs(:))=md.vy(penaltypairs(:));
     23        u(penaltypairs(:))=md.initialization.vx(penaltypairs(:));
     24        v(penaltypairs(:))=md.initialization.vy(penaltypairs(:));
    2525end
    2626
    … …  
    7171                normal(2)=penaltypairs(j,6);
    7272
    73                 vx1=md.vx(penaltypairs(j,1)); vx2=md.vx(penaltypairs(j,2)); vy1=md.vy(penaltypairs(j,1)); vy2=md.vy(penaltypairs(j,2));
     73                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));
    7474                penetration=(vx2-vx1)*normal(1)+(vy2-vy1)*normal(2);
    7575                %if penetration is negative, plot in black, positive, plot in red;: ie: if rift is closing, black, if rift is opening, red.

  • issm/trunk/src/m/model/plot/plot_streamlines.m

    r8472 r9684  
    77%process data and model
    88[x y z index is2d isplanet]=processmesh(md,[],options);
    9 [u datatype]=processdata(md,md.vx,options);
    10 [v datatype]=processdata(md,md.vy,options);
     9[u datatype]=processdata(md,md.initialization.vx,options);
     10[v datatype]=processdata(md,md.initialization.vy,options);
    1111
    1212%some checks

  • issm/trunk/src/m/model/plot/plotdoc.m

    r8420 r9684  
    1111disp('       ''data'' : what we want to plot');
    1212disp('                Available values for ''data'' are: ');
    13 disp('                  - any field of the model structure. ex: plot(md,''data'',''vel''), or plot(md,''data'',md.vel)');
     13disp('                  - any field of the model structure. ex: plot(md,''data'',''vel''), or plot(md,''data'',md.initialization.vel)');
    1414disp('                  - ''basal_drag'': plot the basal drag on the bed (in kPa)');
    1515disp('                  - ''basal_dragx'' or ''basal_dragy'' : plot a component of the basal drag on the bed (in kPa)');

  • issm/trunk/src/m/model/shear2d.m

    r9366 r9684  
    1111
    1212summation=[1;1;1];
    13 sx=(md.vx(md.elements).*alpha)*summation;
    14 uy=(md.vx(md.elements).*beta)*summation;
    15 vx=(md.vy(md.elements).*alpha)*summation;
    16 sy=(md.vy(md.elements).*beta)*summation;                                               
     13sx=(md.initialization.vx(md.elements).*alpha)*summation;
     14uy=(md.initialization.vx(md.elements).*beta)*summation;
     15vx=(md.initialization.vy(md.elements).*alpha)*summation;
     16sy=(md.initialization.vy(md.elements).*beta)*summation;                                         
    1717sxy=(uy+vx)/2;
    1818s=sqrt(sx.^2+sy.^2+sxy.^2+sx.*sy);

  • issm/trunk/src/m/model/thicknessevolution.m

    r8298 r9684  
    99%      dhdt=thicknessevolution(md)
    1010
    11 if (length(md.vx)~=md.numberofnodes)|(length(md.vy)~=md.numberofnodes)
     11if (length(md.initialization.vx)~=md.numberofnodes)|(length(md.initialization.vy)~=md.numberofnodes)
    1212        error(['thicknessevolution error message: vx and vy should have a length of ' num2str(md.numberofnodes)])
    1313end
    … …  
    1515%load some variables
    1616H=md.thickness;
    17 vx=md.vx;
    18 vy=md.vy;
     17vx=md.initialization.vx;
     18vy=md.initialization.vy;
    1919index=md.elements;
    2020

  • issm/trunk/src/m/model/tres.m

    r9681 r9684  
    1111        if md.dim==2,
    1212                if isfield(md.results.DiagnosticSolution,'VxAverage'),
    13                         md.vx=PatchToVec(md.results.DiagnosticSolution.VxAverage);
     13                        md.initialization.vx=PatchToVec(md.results.DiagnosticSolution.VxAverage);
    1414                else
    15                         md.vx=PatchToVec(md.results.DiagnosticSolution.Vx);
     15                        md.initialization.vx=PatchToVec(md.results.DiagnosticSolution.Vx);
    1616                end
    1717                if isfield(md.results.DiagnosticSolution,'VyAverage'),
    18                         md.vy=PatchToVec(md.results.DiagnosticSolution.VyAverage);
     18                        md.initialization.vy=PatchToVec(md.results.DiagnosticSolution.VyAverage);
    1919                else
    20                         md.vy=PatchToVec(md.results.DiagnosticSolution.Vy);
     20                        md.initialization.vy=PatchToVec(md.results.DiagnosticSolution.Vy);
    2121                end
    2222        else
    23                 md.vx=PatchToVec(md.results.DiagnosticSolution.Vx);
    24                 md.vy=PatchToVec(md.results.DiagnosticSolution.Vy);
     23                md.initialization.vx=PatchToVec(md.results.DiagnosticSolution.Vx);
     24                md.initialization.vy=PatchToVec(md.results.DiagnosticSolution.Vy);
    2525                if isfield(md.results.DiagnosticSolution,'Vz'),
    26                         md.vz=PatchToVec(md.results.DiagnosticSolution.Vz);
     26                        md.initialization.vz=PatchToVec(md.results.DiagnosticSolution.Vz);
    2727                else
    28                         md.vz=zeros(md.numberofnodes,1);
     28                        md.initialization.vz=zeros(md.numberofnodes,1);
    2929                end
    3030        end
    31         md.vel=PatchToVec(md.results.DiagnosticSolution.Vel);
     31        md.initialization.vel=PatchToVec(md.results.DiagnosticSolution.Vel);
    3232
    3333        if isfield(md.results.DiagnosticSolution,'Pressure'),
    34                 md.pressure=PatchToVec(md.results.DiagnosticSolution.Pressure);
     34                md.initialization.pressure=PatchToVec(md.results.DiagnosticSolution.Pressure);
    3535        end
    3636        if md.rifts.numrifts,
    … …  
    7676        clear results,results2;
    7777elseif strcmpi(string,'steadystate'),
    78         md.vx=PatchToVec(md.results.SteadystateSolution.Vx);
    79         md.vy=PatchToVec(md.results.SteadystateSolution.Vy);
     78        md.initialization.vx=PatchToVec(md.results.SteadystateSolution.Vx);
     79        md.initialization.vy=PatchToVec(md.results.SteadystateSolution.Vy);
    8080        if isfield(md.results.SteadystateSolution,'Vz'),
    81                 md.vz=PatchToVec(md.results.SteadystateSolution.Vz);
     81                md.initialization.vz=PatchToVec(md.results.SteadystateSolution.Vz);
    8282        end
    8383
    84         md.vel=PatchToVec(md.results.SteadystateSolution.Vel);
    85         md.pressure=PatchToVec(md.results.SteadystateSolution.Pressure);
    86         md.temperature=PatchToVec(md.results.SteadystateSolution.Temperature);
     84        md.initialization.vel=PatchToVec(md.results.SteadystateSolution.Vel);
     85        md.initialization.pressure=PatchToVec(md.results.SteadystateSolution.Pressure);
     86        md.initialization.temperature=PatchToVec(md.results.SteadystateSolution.Temperature);
    8787        md.basalforcings.melting_rate=PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate);
    8888
    … …  
    9494
    9595elseif strcmpi(string,'thermal'),
    96         md.temperature=PatchToVec(md.results.ThermalSolution.Temperature);
     96        md.initialization.temperature=PatchToVec(md.results.ThermalSolution.Temperature);
    9797        md.basalforcings.melting_rate=PatchToVec(md.results.ThermalSolution.BasalMeltingRate);
    9898elseif strcmpi(string,'hydrology'),
    99         md.watercolumn=PatchToVec(md.results.HydrologySolution.Watercolumn);
     99        md.initialization.watercolumn=PatchToVec(md.results.HydrologySolution.Watercolumn);
    100100
    101101else

  • issm/trunk/src/m/utils/BC/SetIceSheetBC.m

    r9681 r9684  
    5757md.prognostic.spcthickness=NaN*ones(md.numberofnodes,1);
    5858
    59 if (length(md.temperature)==md.numberofnodes),
     59if (length(md.initialization.temperature)==md.numberofnodes),
    6060        md.thermal.spctemperature=NaN*ones(md.numberofnodes,1);
    61         pos=find(md.nodeonsurface); md.thermal.spctemperature(pos)=md.temperature(pos); %impose observed temperature on surface
     61        pos=find(md.nodeonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface
    6262        if (length(md.basalforcings.geothermalflux)~=md.numberofnodes),
    6363                md.basalforcings.geothermalflux=50*10^-3*ones(md.numberofnodes,1); %50 mW/m^2

  • issm/trunk/src/m/utils/BC/SetIceShelfBC.m

    r9681 r9684  
    9090md.balancethickness.spcthickness=NaN*ones(md.numberofnodes,1);
    9191
    92 if (length(md.temperature)==md.numberofnodes),
     92if (length(md.initialization.temperature)==md.numberofnodes),
    9393        md.thermal.spctemperature=NaN*ones(md.numberofnodes,1);
    94         pos=find(md.nodeonsurface); md.thermal.spctemperature(pos)=md.temperature(pos); %impose observed temperature on surface
     94        pos=find(md.nodeonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface
    9595        if (length(md.basalforcings.geothermalflux)~=md.numberofnodes),
    9696                md.basalforcings.geothermalflux=zeros(md.numberofnodes,1);

  • issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m

    r9681 r9684  
    100100md.prognostic.spcthickness=NaN*ones(md.numberofnodes,1);
    101101
    102 if (length(md.temperature)==md.numberofnodes),
     102if (length(md.initialization.temperature)==md.numberofnodes),
    103103        md.thermal.spctemperature=NaN*ones(md.numberofnodes,1);
    104         pos=find(md.nodeonsurface); md.thermal.spctemperature(pos)=md.temperature(pos); %impose observed temperature on surface
     104        pos=find(md.nodeonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface
    105105        if (length(md.basalforcings.geothermalflux)~=md.numberofnodes),
    106106                md.basalforcings.geothermalflux=zeros(md.numberofnodes,1);

  • issm/trunk/src/m/utils/Exp/downstreamflowlines.m

    r9365 r9684  
    1010%
    1111%   Example:
    12 %      flowpath=downstreamflowlines(md.elements,md.x,md.y,md.vx,md.vy,x0,y0)
     12%      flowpath=downstreamflowlines(md.elements,md.x,md.y,md.vx,md.initialization.vy,x0,y0)
    1313
    1414%check input size

  • issm/trunk/src/m/utils/Exp/flowlines.m

    r5392 r9684  
    1010%
    1111%   Example:
    12 %      flowpath=flowlines(md.elements,md.x,md.y,md.vx,md.vy,x0,y0)
     12%      flowpath=flowlines(md.elements,md.x,md.y,md.vx,md.initialization.vy,x0,y0)
    1313
    1414%check input size

  • issm/trunk/src/m/utils/Interp/plugvelocities.m

    r9681 r9684  
    3838md.inversion.vel_obs=sqrt(md.inversion.vx_obs.^2+md.inversion.vy_obs.^2);
    3939md.vx=md.inversion.vx_obs;
    40 md.vy=md.inversion.vy_obs;
    41 md.vel=md.inversion.vel_obs;
     40md.initialization.vy=md.inversion.vy_obs;
     41md.initialization.vel=md.inversion.vel_obs;

  • issm/trunk/test/Miscellaneous/GJM_test1/SquareShelf.par

    r9642 r9684  
    1414md.materials.rheology_B=paterson(md.observed_temperature);
    1515md.materials.rheology_n=3*ones(md.numberofelements,1);
    16 md.temperature=md.observed_temperature;
     16md.initialization.temperature=md.observed_temperature;
    1717
    1818%Friction

  • issm/trunk/test/NightlyRun/test1201.m

    r9664 r9684  
    1414
    1515        disp('      initial velocity');
    16         md.vx=zeros(md.numberofnodes,1);
    17         md.vy=-400*ones(md.numberofnodes,1);
     16        md.initialization.vx=zeros(md.numberofnodes,1);
     17        md.initialization.vy=-400*ones(md.numberofnodes,1);
    1818
    1919        %Stabilization

  • issm/trunk/test/NightlyRun/test1204.m

    r9679 r9684  
    1818
    1919%plot results
    20 md.vx=PatchToVec(md.results.DiagnosticSolution.Vx);
    21 md.vy=PatchToVec(md.results.DiagnosticSolution.Vy);
     20md.initialization.vx=PatchToVec(md.results.DiagnosticSolution.Vx);
     21md.initialization.vy=PatchToVec(md.results.DiagnosticSolution.Vy);
    2222
    2323md.timestepping.time_step=1;

  • issm/trunk/test/NightlyRun/test1301.m

    r9664 r9684  
    1313
    1414%Some conditions specific to melting test
    15 md.pressure=zeros(md.numberofnodes,1);
    16 md.temperature=273.15*ones(md.numberofnodes,1);
     15md.initialization.pressure=zeros(md.numberofnodes,1);
     16md.initialization.temperature=273.15*ones(md.numberofnodes,1);
    1717pos=find(md.nodeonsurface);
    18 md.thermal.spctemperature(pos)=md.temperature(pos);
    19 md.materials.rheology_B=paterson(md.temperature);
     18md.thermal.spctemperature(pos)=md.initialization.temperature(pos);
     19md.materials.rheology_B=paterson(md.initialization.temperature);
    2020
    2121%analytical results

  • issm/trunk/test/NightlyRun/test1302.m

    r9664 r9684  
    1414pos1=find(md.elementonbed);     md.thermal.spctemperature(md.elements(pos1,1:3))=10;
    1515pos2=find(md.elementonsurface); md.thermal.spctemperature(md.elements(pos2,4:6))=0;
    16 md.vz=0.1*ones(md.numberofnodes,1);
    17 md.vel=sqrt( md.vx.^2+ md.vy.^2+ md.vz.^2);
    18 md.pressure=zeros(md.numberofnodes,1);
     16md.initialization.vz=0.1*ones(md.numberofnodes,1);
     17md.initialization.vel=sqrt( md.initialization.vx.^2+ md.initialization.vy.^2+ md.initialization.vz.^2);
     18md.initialization.pressure=zeros(md.numberofnodes,1);
    1919
    2020%analytical results
    … …  
    2323A=10/(exp(alpha*(-1000))-1);    %A=T(bed)/(exp(alpha*bed)-1)  with bed=-1000 T(bed)=10
    2424B=-A;
    25 md.temperature=A*exp(alpha*md.z)+B;
     25md.initialization.temperature=A*exp(alpha*md.z)+B;
    2626
    2727%modeled  results
    … …  
    3232comp_temp=zeros(md.numberofnodes,1);
    3333comp_temp(md.results.ThermalSolution.Temperature.index)=md.results.ThermalSolution.Temperature.value;
    34 relative=abs((comp_temp-md.temperature)./md.temperature)*100;
    35 relative(find(comp_temp==md.temperature))=0;
     34relative=abs((comp_temp-md.initialization.temperature)./md.initialization.temperature)*100;
     35relative(find(comp_temp==md.initialization.temperature))=0;
    3636plotmodel(md,'data',comp_temp,'title','Modeled temperature [K]','data','temperature','view',3,...
    37         'title','Analytical temperature [K]','view',3,'data',comp_temp-md.temperature,...
     37        'title','Analytical temperature [K]','view',3,'data',comp_temp-md.initialization.temperature,...
    3838        'title','Absolute error [K]','view',3,'data',relative,'title','Relative error [%]','view',3,...
    3939        'figposition','mathieu','FontSize#all',20)

  • issm/trunk/test/NightlyRun/test1303.m

    r9664 r9684  
    1313pos1=find(md.elementonbed);     md.thermal.spctemperature(md.elements(pos1,1:3))=10;
    1414pos2=find(md.elementonsurface); md.thermal.spctemperature(md.elements(pos2,4:6))=0;
    15 md.pressure=zeros(md.numberofnodes,1);
     15md.initialization.pressure=zeros(md.numberofnodes,1);
    1616
    1717%analytical results
    1818%d2T/dz2=0 T(bed)=10 T(surface)=0  => T=0*(z-bed)/thickness+10*(surface-z)/thickness
    1919%each layer of the 3d mesh must have a constant value
    20 md.temperature=10*(md.surface-md.z)./md.thickness;
     20md.initialization.temperature=10*(md.surface-md.z)./md.thickness;
    2121
    2222%modeled  results
    … …  
    2727comp_temp=zeros(md.numberofnodes,1);
    2828comp_temp(md.results.ThermalSolution.Temperature.index)=md.results.ThermalSolution.Temperature.value;
    29 relative=abs((comp_temp-md.temperature)./md.temperature)*100;
    30 relative(find(comp_temp==md.temperature))=0;
     29relative=abs((comp_temp-md.initialization.temperature)./md.initialization.temperature)*100;
     30relative(find(comp_temp==md.initialization.temperature))=0;
    3131plotmodel(md,'data',comp_temp,'title','Modeled temperature [K]','data','temperature','view',3,...
    32         'title','Analytical temperature [K]','view',3,'data',comp_temp-md.temperature,...
     32        'title','Analytical temperature [K]','view',3,'data',comp_temp-md.initialization.temperature,...
    3333        'title','Absolute error [K]','view',3,'data',relative,'title','Relative error [%]','view',3,...
    3434        'figposition','mathieu','FontSize#all',20)

  • issm/trunk/test/NightlyRun/test1304.m

    r9664 r9684  
    1313
    1414pos2=find(md.elementonsurface); md.thermal.spctemperature(md.elements(pos2,4:6))=0;
    15 md.pressure=zeros(md.numberofnodes,1);
     15md.initialization.pressure=zeros(md.numberofnodes,1);
    1616md.basalforcings.geothermalflux(:)=0.1; %100mW/m^2
    1717
    … …  
    1919%the result is linear with depth and is equal to 0 on the upper surface (See BC)
    2020%d2T/dz2=0  -k*dT/dz(bed)=G  T(surface)=0  => T=-G/k*(z-surface)
    21 md.temperature=-0.1/md.thermalconductivity*(md.z-md.surface); %G=0.1 W/m2
     21md.initialization.temperature=-0.1/md.thermalconductivity*(md.z-md.surface); %G=0.1 W/m2
    2222
    2323%modeled  results
    … …  
    2828comp_temp=zeros(md.numberofnodes,1);
    2929comp_temp(md.results.ThermalSolution.Temperature.index)=md.results.ThermalSolution.Temperature.value;
    30 relative=abs((comp_temp-md.temperature)./md.temperature)*100;
    31 relative(find(comp_temp==md.temperature))=0;
     30relative=abs((comp_temp-md.initialization.temperature)./md.initialization.temperature)*100;
     31relative(find(comp_temp==md.initialization.temperature))=0;
    3232plotmodel(md,'data',comp_temp,'title','Modeled temperature [K]','data','temperature','view',3,...
    33         'title','Analytical temperature','view',3,'data',comp_temp-md.temperature,...
     33        'title','Analytical temperature','view',3,'data',comp_temp-md.initialization.temperature,...
    3434        'title','Absolute error [K]','view',3,'data',relative,'title','Relative error [%]','view',3,...
    3535        'figposition','mathieu','FontSize#all',20)

  • issm/trunk/test/NightlyRun/test135.m

    r9682 r9684  
    44md=parameterize(md,'../Par/SquareShelfConstrained.par');
    55md.balancethickness.stabilization=3;
    6 md.vy=md.vy+400;
     6md.initialization.vy=md.initialization.vy+400;
    77md=setflowequation(md,'macayeal','all');
    88md.cluster=none;

  • issm/trunk/test/NightlyRun/test136.m

    r9682 r9684  
    44md=parameterize(md,'../Par/SquareShelfConstrained.par');
    55md.balancethickness.stabilization=3;
    6 md.vy=md.vy+400;
     6md.initialization.vy=md.initialization.vy+400;
    77md=setflowequation(md,'macayeal','all');
    88md.cluster=generic('name',oshostname(),'np',3);

  • issm/trunk/test/NightlyRun/test223.m

    r9681 r9684  
    1515md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1616md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    17 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     17md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1818
    1919md.cluster=none;

  • issm/trunk/test/NightlyRun/test224.m

    r9681 r9684  
    1515md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1616md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    17 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     17md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1818
    1919md.cluster=generic('name',oshostname(),'np',3);

  • issm/trunk/test/NightlyRun/test225.m

    r9681 r9684  
    1616md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1717md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    18 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     18md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1919
    2020md.cluster=none;

  • issm/trunk/test/NightlyRun/test226.m

    r9681 r9684  
    1616md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1717md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    18 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     18md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1919
    2020md.cluster=generic('name',oshostname(),'np',3);

  • issm/trunk/test/NightlyRun/test227.m

    r9681 r9684  
    1616md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1717md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    18 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     18md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1919
    2020md.cluster=none;

  • issm/trunk/test/NightlyRun/test228.m

    r9681 r9684  
    1616md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1717md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    18 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     18md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1919
    2020md.cluster=generic('name',oshostname(),'np',3);

  • issm/trunk/test/NightlyRun/test229.m

    r9681 r9684  
    1616md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1717md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    18 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     18md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1919
    2020md.cluster=none;

  • issm/trunk/test/NightlyRun/test230.m

    r9681 r9684  
    1616md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1717md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    18 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     18md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1919
    2020md.cluster=generic('name',oshostname(),'np',3);

  • issm/trunk/test/NightlyRun/test233.m

    r9679 r9684  
    2626
    2727%Initial velocity and pressure
    28 md.vx=zeros(md.numberofnodes,1);
    29 md.vy=zeros(md.numberofnodes,1);
    30 md.vz=zeros(md.numberofnodes,1);
    31 md.pressure=zeros(md.numberofnodes,1);
     28md.initialization.vx=zeros(md.numberofnodes,1);
     29md.initialization.vy=zeros(md.numberofnodes,1);
     30md.initialization.vz=zeros(md.numberofnodes,1);
     31md.initialization.pressure=zeros(md.numberofnodes,1);
    3232
    3333%Materials
    34 md.temperature=(273-20)*ones(md.numberofnodes,1);
    35 md.materials.rheology_B=paterson(md.temperature);
     34md.initialization.temperature=(273-20)*ones(md.numberofnodes,1);
     35md.materials.rheology_B=paterson(md.initialization.temperature);
    3636md.materials.rheology_n=3*ones(md.numberofelements,1);
    3737

  • issm/trunk/test/NightlyRun/test234.m

    r9679 r9684  
    2626
    2727%Initial velocity and pressure
    28 md.vx=zeros(md.numberofnodes,1);
    29 md.vy=zeros(md.numberofnodes,1);
    30 md.vz=zeros(md.numberofnodes,1);
    31 md.pressure=zeros(md.numberofnodes,1);
     28md.initialization.vx=zeros(md.numberofnodes,1);
     29md.initialization.vy=zeros(md.numberofnodes,1);
     30md.initialization.vz=zeros(md.numberofnodes,1);
     31md.initialization.pressure=zeros(md.numberofnodes,1);
    3232
    3333%Materials
    34 md.temperature=(273-20)*ones(md.numberofnodes,1);
    35 md.materials.rheology_B=paterson(md.temperature);
     34md.initialization.temperature=(273-20)*ones(md.numberofnodes,1);
     35md.materials.rheology_B=paterson(md.initialization.temperature);
    3636md.materials.rheology_n=3*ones(md.numberofelements,1);
    3737

  • issm/trunk/test/NightlyRun/test235.m

    r9679 r9684  
    2323
    2424%Initial velocity and pressure
    25 md.vx=zeros(md.numberofnodes,1);
    26 md.vy=zeros(md.numberofnodes,1);
    27 md.vz=zeros(md.numberofnodes,1);
    28 md.pressure=zeros(md.numberofnodes,1);
     25md.initialization.vx=zeros(md.numberofnodes,1);
     26md.initialization.vy=zeros(md.numberofnodes,1);
     27md.initialization.vz=zeros(md.numberofnodes,1);
     28md.initialization.pressure=zeros(md.numberofnodes,1);
    2929
    3030%Materials
    31 md.temperature=(273-20)*ones(md.numberofnodes,1);
    32 md.materials.rheology_B=paterson(md.temperature);
     31md.initialization.temperature=(273-20)*ones(md.numberofnodes,1);
     32md.materials.rheology_B=paterson(md.initialization.temperature);
    3333md.materials.rheology_n=3*ones(md.numberofelements,1);
    3434

  • issm/trunk/test/NightlyRun/test236.m

    r9679 r9684  
    2323
    2424%Initial velocity and pressure
    25 md.vx=zeros(md.numberofnodes,1);
    26 md.vy=zeros(md.numberofnodes,1);
    27 md.vz=zeros(md.numberofnodes,1);
    28 md.pressure=zeros(md.numberofnodes,1);
     25md.initialization.vx=zeros(md.numberofnodes,1);
     26md.initialization.vy=zeros(md.numberofnodes,1);
     27md.initialization.vz=zeros(md.numberofnodes,1);
     28md.initialization.pressure=zeros(md.numberofnodes,1);
    2929
    3030%Materials
    31 md.temperature=(273-20)*ones(md.numberofnodes,1);
    32 md.materials.rheology_B=paterson(md.temperature);
     31md.initialization.temperature=(273-20)*ones(md.numberofnodes,1);
     32md.materials.rheology_B=paterson(md.initialization.temperature);
    3333md.materials.rheology_n=3*ones(md.numberofelements,1);
    3434

  • issm/trunk/test/NightlyRun/test337.m

    r9681 r9684  
    1515md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1616md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    17 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     17md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1818
    1919md.cluster=none;

  • issm/trunk/test/NightlyRun/test338.m

    r9681 r9684  
    1515md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1616md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    17 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     17md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1818
    1919md.cluster=generic('name',oshostname(),'np',3);

  • issm/trunk/test/NightlyRun/test339.m

    r9681 r9684  
    1616md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1717md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    18 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     18md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1919
    2020md.cluster=none;

  • issm/trunk/test/NightlyRun/test340.m

    r9681 r9684  
    1616md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1717md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    18 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     18md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1919
    2020md.cluster=generic('name',oshostname(),'np',3);

  • issm/trunk/test/NightlyRun/test341.m

    r9681 r9684  
    1616md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1717md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    18 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     18md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1919
    2020md.cluster=none;

  • issm/trunk/test/NightlyRun/test342.m

    r9681 r9684  
    1616md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1717md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    18 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     18md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1919
    2020md.cluster=generic('name',oshostname(),'np',3);

  • issm/trunk/test/NightlyRun/test343.m

    r9681 r9684  
    1616md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1717md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    18 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     18md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1919
    2020md.cluster=none;

  • issm/trunk/test/NightlyRun/test344.m

    r9681 r9684  
    1616md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1717md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    18 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     18md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1919
    2020md.cluster=generic('name',oshostname(),'np',3);

  • issm/trunk/test/NightlyRun/test429.m

    r9681 r9684  
    1717md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    1818md.timestepping.time_step=0;
    19 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     19md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    2020
    2121md.cluster=none;

  • issm/trunk/test/NightlyRun/test430.m

    r9681 r9684  
    1717md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    1818md.timestepping.time_step=0;
    19 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     19md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    2020
    2121md.cluster=generic('name',oshostname(),'np',3);

  • issm/trunk/test/NightlyRun/test431.m

    r9681 r9684  
    1717md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    1818md.timestepping.time_step=0;
    19 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     19md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    2020
    2121md.cluster=none;

  • issm/trunk/test/NightlyRun/test432.m

    r9681 r9684  
    1717md.inversion.step_threshold=0.3*ones(md.inversion.nsteps,1);
    1818md.timestepping.time_step=0;
    19 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     19md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    2020
    2121md.cluster=generic('name',oshostname(),'np',3);

  • issm/trunk/test/NightlyRun/test521.m

    r9681 r9684  
    2121md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    2222md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1);
    23 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     23md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    2424
    2525md.cluster=none;

  • issm/trunk/test/NightlyRun/test522.m

    r9681 r9684  
    2121md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    2222md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1);
    23 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     23md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    2424
    2525md.cluster=generic('name',oshostname(),'np',3);

  • issm/trunk/test/NightlyRun/test523.m

    r9681 r9684  
    1616md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1717md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1);
    18 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     18md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1919
    2020md.cluster=none;

  • issm/trunk/test/NightlyRun/test524.m

    r9681 r9684  
    1616md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1717md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1);
    18 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     18md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1919
    2020md.cluster=generic('name',oshostname(),'np',3);

  • issm/trunk/test/NightlyRun/test525.m

    r9681 r9684  
    1616md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1717md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1);
    18 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     18md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1919md.timestepping.time_step=0;
    2020

  • issm/trunk/test/NightlyRun/test526.m

    r9681 r9684  
    1616md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1);
    1717md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1);
    18 md.inversion.vx_obs=md.vx; md.inversion.vy_obs=md.vy;
     18md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy;
    1919md.timestepping.time_step=0;
    2020

  • issm/trunk/test/Par/79North.par

    r9679 r9684  
    33%Geometry and observation
    44load('../Data/79North.data','-mat');
    5 md.vx       =InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y);
    6 md.vy       =InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y);
     5md.initialization.vx       =InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y);
     6md.initialization.vy       =InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y);
    77md.surface  =InterpFromMeshToMesh2d(index,x,y,surface,md.x,md.y);
    88md.thickness=InterpFromMeshToMesh2d(index,x,y,thickness,md.x,md.y);
    … …  
    1111
    1212%Materials
    13 md.temperature=(273-20)*ones(md.numberofnodes,1);
    14 md.materials.rheology_B=paterson(md.temperature);
     13md.initialization.temperature=(273-20)*ones(md.numberofnodes,1);
     14md.materials.rheology_B=paterson(md.initialization.temperature);
    1515md.materials.rheology_n=3*ones(md.numberofelements,1);
    1616

  • issm/trunk/test/Par/ISMIPF.par

    r9679 r9684  
    2222md=SetIceSheetBC(md);
    2323md.diagnostic.spcvx=100*ones(md.numberofnodes,1);
    24 md.vx=zeros(md.numberofnodes,1);
    25 md.vy=zeros(md.numberofnodes,1);
    26 md.vz=zeros(md.numberofnodes,1);
    27 md.vel=zeros(md.numberofnodes,1);
    28 md.pressure=zeros(md.numberofnodes,1);
    29 md.temperature=255*ones(md.numberofnodes,1);
     24md.initialization.vx=zeros(md.numberofnodes,1);
     25md.initialization.vy=zeros(md.numberofnodes,1);
     26md.initialization.vz=zeros(md.numberofnodes,1);
     27md.initialization.vel=zeros(md.numberofnodes,1);
     28md.initialization.pressure=zeros(md.numberofnodes,1);
     29md.initialization.temperature=255*ones(md.numberofnodes,1);
    3030pos=find(md.x==min(md.x) | md.x==max(md.x) | md.y==min(md.y) | md.y==max(md.y));
    3131md.balancethickness.spcthickness=NaN*ones(md.numberofnodes,1);

  • issm/trunk/test/Par/Pig.par

    r9681 r9684  
    99md.bed=md.surface-md.thickness;
    1010clear surface thickness vx_obs vy_obs x y index;
    11 md.vx=md.inversion.vx_obs;
    12 md.vy=md.inversion.vy_obs;
    13 md.vz=zeros(md.numberofnodes,1);
    14 md.pressure=zeros(md.numberofnodes,1);
     11md.initialization.vx=md.inversion.vx_obs;
     12md.initialization.vy=md.inversion.vy_obs;
     13md.initialization.vz=zeros(md.numberofnodes,1);
     14md.initialization.pressure=zeros(md.numberofnodes,1);
    1515
    1616%Materials
    17 md.temperature=(273-20)*ones(md.numberofnodes,1);
    18 md.materials.rheology_B=paterson(md.temperature);
     17md.initialization.temperature=(273-20)*ones(md.numberofnodes,1);
     18md.materials.rheology_B=paterson(md.initialization.temperature);
    1919md.materials.rheology_n=3*ones(md.numberofelements,1);
    20 md.temperature=md.temperature;
     20md.initialization.temperature=md.initialization.temperature;
    2121
    2222%Friction

  • issm/trunk/test/Par/RoundSheetEISMINT.par

    r9681 r9684  
    1414st=1.67*10^-2/1000; %k/m;
    1515radius=sqrt((md.x).^2+(md.y).^2);
    16 md.temperature=(tmin+st*radius);
     16md.initialization.temperature=(tmin+st*radius);
    1717md.basalforcings.geothermalflux=4.2*10^-2*ones(md.numberofnodes,1);
    1818
    … …  
    3232md.inversion.vy_obs=constant/2*md.y.*(md.thickness).^-1;
    3333md.inversion.vel_obs=(sqrt((md.inversion.vx_obs).^2+(md.inversion.vy_obs).^2));
    34 md.vx=zeros(md.numberofnodes,1);
    35 md.vy=zeros(md.numberofnodes,1);
    36 md.vz=zeros(md.numberofnodes,1);
    37 md.pressure=zeros(md.numberofnodes,1);
     34md.initialization.vx=zeros(md.numberofnodes,1);
     35md.initialization.vy=zeros(md.numberofnodes,1);
     36md.initialization.vz=zeros(md.numberofnodes,1);
     37md.initialization.pressure=zeros(md.numberofnodes,1);
    3838
    3939%Deal with boundary conditions:

  • issm/trunk/test/Par/RoundSheetShelf.par

    r9679 r9684  
    3434
    3535%Initial velocity
    36 md.vx=zeros(md.numberofnodes,1);
    37 md.vy=zeros(md.numberofnodes,1);
    38 md.vz=zeros(md.numberofnodes,1);
    39 md.pressure=zeros(md.numberofnodes,1);
     36md.initialization.vx=zeros(md.numberofnodes,1);
     37md.initialization.vy=zeros(md.numberofnodes,1);
     38md.initialization.vz=zeros(md.numberofnodes,1);
     39md.initialization.pressure=zeros(md.numberofnodes,1);
    4040
    4141%Materials
    42 md.temperature=(273-20)*ones(md.numberofnodes,1);
    43 md.materials.rheology_B=paterson(md.temperature);
     42md.initialization.temperature=(273-20)*ones(md.numberofnodes,1);
     43md.materials.rheology_B=paterson(md.initialization.temperature);
    4444md.materials.rheology_n=3*ones(md.numberofelements,1);
    4545

  • issm/trunk/test/Par/RoundSheetStaticEISMINT.par

    r9681 r9684  
    1919tmin=238.15; %K
    2020st=1.67*10^-2/1000; %k/m;
    21 md.temperature=(tmin+st*radius);
     21md.initialization.temperature=(tmin+st*radius);
    2222md.basalforcings.geothermalflux=4.2*10^-2*ones(md.numberofnodes,1);
    2323
    … …  
    3737md.inversion.vy_obs=constant/2*md.y.*(md.thickness).^-1;
    3838md.inversion.vel_obs=(sqrt((md.inversion.vx_obs).^2+(md.inversion.vy_obs).^2));
    39 md.vx=zeros(md.numberofnodes,1);
    40 md.vy=zeros(md.numberofnodes,1);
    41 md.vz=zeros(md.numberofnodes,1);
    42 md.pressure=zeros(md.numberofnodes,1);
     39md.initialization.vx=zeros(md.numberofnodes,1);
     40md.initialization.vy=zeros(md.numberofnodes,1);
     41md.initialization.vz=zeros(md.numberofnodes,1);
     42md.initialization.pressure=zeros(md.numberofnodes,1);
    4343
    4444%Deal with boundary conditions:

  • issm/trunk/test/Par/SquareEISMINT.par

    r9645 r9684  
    1717
    1818disp('      creating temperature');
    19 md.temperature=(273-20)*ones(md.numberofnodes,1);
     19md.initialization.temperature=(273-20)*ones(md.numberofnodes,1);
    2020
    2121disp('      creating flow law paramter');

  • issm/trunk/test/Par/SquareSheetConstrained.par

    r9679 r9684  
    1212%Initial velocity
    1313load('../Data/SquareSheetConstrained.data','-mat');
    14 md.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y);
    15 md.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y);
     14md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y);
     15md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y);
    1616clear vx vy x y index;
    17 md.vz=zeros(md.numberofnodes,1);
    18 md.pressure=zeros(md.numberofnodes,1);
     17md.initialization.vz=zeros(md.numberofnodes,1);
     18md.initialization.pressure=zeros(md.numberofnodes,1);
    1919
    2020%Materials
    21 md.temperature=(273-20)*ones(md.numberofnodes,1);
    22 md.materials.rheology_B=paterson(md.temperature);
     21md.initialization.temperature=(273-20)*ones(md.numberofnodes,1);
     22md.materials.rheology_B=paterson(md.initialization.temperature);
    2323md.materials.rheology_n=3*ones(md.numberofelements,1);
    2424

  • issm/trunk/test/Par/SquareSheetShelf.par

    r9679 r9684  
    1515%Initial velocity
    1616load('../Data/SquareSheetShelf.data','-mat');
    17 md.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y);
    18 md.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y);
     17md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y);
     18md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y);
    1919clear vx vy x y index;
    20 md.vz=zeros(md.numberofnodes,1);
    21 md.pressure=zeros(md.numberofnodes,1);
     20md.initialization.vz=zeros(md.numberofnodes,1);
     21md.initialization.pressure=zeros(md.numberofnodes,1);
    2222
    2323%Materials
    24 md.temperature=(273-20)*ones(md.numberofnodes,1);
    25 md.materials.rheology_B=paterson(md.temperature);
     24md.initialization.temperature=(273-20)*ones(md.numberofnodes,1);
     25md.materials.rheology_B=paterson(md.initialization.temperature);
    2626md.materials.rheology_n=3*ones(md.numberofelements,1);
    2727

  • issm/trunk/test/Par/SquareShelf.par

    r9679 r9684  
    1212%Initial velocity and pressure
    1313load('../Data/SquareShelf.data','-mat');
    14 md.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y);
    15 md.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y);
     14md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y);
     15md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y);
    1616clear vx vy x y index;
    17 md.vz=zeros(md.numberofnodes,1);
    18 md.pressure=zeros(md.numberofnodes,1);
     17md.initialization.vz=zeros(md.numberofnodes,1);
     18md.initialization.pressure=zeros(md.numberofnodes,1);
    1919
    2020%Materials
    21 md.temperature=(273-20)*ones(md.numberofnodes,1);
    22 md.materials.rheology_B=paterson(md.temperature);
     21md.initialization.temperature=(273-20)*ones(md.numberofnodes,1);
     22md.materials.rheology_B=paterson(md.initialization.temperature);
    2323md.materials.rheology_n=3*ones(md.numberofelements,1);
    2424

  • issm/trunk/test/Par/SquareShelfConstrained.par

    r9679 r9684  
    1212%Initial velocity
    1313load('../Data/SquareShelfConstrained.data','-mat');
    14 md.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y);
    15 md.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y);
     14md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y);
     15md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y);
    1616clear vx vy x y index;
    17 md.vz=zeros(md.numberofnodes,1);
    18 md.pressure=zeros(md.numberofnodes,1);
     17md.initialization.vz=zeros(md.numberofnodes,1);
     18md.initialization.pressure=zeros(md.numberofnodes,1);
    1919
    2020%Materials
    21 md.temperature=(273-20)*ones(md.numberofnodes,1);
    22 md.materials.rheology_B=paterson(md.temperature);
     21md.initialization.temperature=(273-20)*ones(md.numberofnodes,1);
     22md.materials.rheology_B=paterson(md.initialization.temperature);
    2323md.materials.rheology_n=3*ones(md.numberofelements,1);
    2424

  • issm/trunk/test/Par/SquareThermal.par

    r9641 r9684  
    1010
    1111disp('      creating velocities');
    12 md.vx=zeros(md.numberofnodes,1);
    13 md.vy=zeros(md.numberofnodes,1);
    14 md.vz=zeros(md.numberofnodes,1);
     12md.initialization.vx=zeros(md.numberofnodes,1);
     13md.initialization.vy=zeros(md.numberofnodes,1);
     14md.initialization.vz=zeros(md.numberofnodes,1);
    1515
    1616disp('      creating drag');
    … …  
    2323
    2424disp('      creating temperatures');
    25 md.temperature=(273-20)*ones(md.numberofnodes,1);
     25md.initialization.temperature=(273-20)*ones(md.numberofnodes,1);
    2626
    2727disp('      creating flow law paramter');
    28 md.materials.rheology_B=paterson(md.temperature);
     28md.materials.rheology_B=paterson(md.initialization.temperature);
    2929md.materials.rheology_n=3*ones(md.numberofelements,1);
    3030
    … …  
    3939
    4040disp('      boundary conditions for thermal model');
    41 md.thermal.spctemperature(:)=md.temperature;
     41md.thermal.spctemperature(:)=md.initialization.temperature;
    4242md.basalforcings.geothermalflux=zeros(md.numberofnodes,1);
    4343pos=find(md.mask.elementongroundedice);md.basalforcings.geothermalflux(md.elements(pos,:))=1*10^-3; %1 mW/m^2
Note: See TracChangeset for help on using the changeset viewer.