Changeset 9654


Ignore:
Timestamp:
09/07/11 13:19:25 (14 years ago)
Author:
seroussi
Message:

bamg minor

Location:
issm/trunk/src/m/model
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/m/model/bamg.m

    r9619 r9654  
    330330md.z=zeros(md.numberofnodes,1);
    331331md.nodeonbed=ones(md.numberofnodes,1);
    332 md.nodeonwater=zeros(md.numberofnodes,1);
     332md.mask.vertexonwater=zeros(md.numberofnodes,1);
    333333md.nodeonsurface=ones(md.numberofnodes,1);
    334334md.elementonbed=ones(md.numberofelements,1);
  • issm/trunk/src/m/model/collapse.m

    r9646 r9654  
    5050        md.elements_type=project2d(md,md.elements_type,1);
    5151end     
    52 md.nodeonhutter=project2d(md,md.nodeonhutter,1);
    53 md.nodeonmacayeal=project2d(md,md.nodeonmacayeal,1);
    54 md.nodeonpattyn=project2d(md,md.nodeonpattyn,1);
    55 md.nodeonstokes=project2d(md,md.nodeonstokes,1);
    5652
    5753%boundary conditions
  • issm/trunk/src/m/model/extrude.m

    r9646 r9654  
    158158        md.elements_type=zeros(number_el3d,1);
    159159        md.elements_type=project3d(md,'vector',oldelements_type,'type','element');
    160         md.nodeonhutter=project3d(md,'vector',md.nodeonhutter,'type','node');
    161         md.nodeonmacayeal=project3d(md,'vector',md.nodeonmacayeal,'type','node');
    162         md.nodeonpattyn=project3d(md,'vector',md.nodeonpattyn,'type','node');
    163         md.nodeonstokes=project3d(md,'vector',md.nodeonstokes,'type','node');
    164160end
    165161
  • issm/trunk/src/m/model/ismodelselfconsistent.m

    r9650 r9654  
    386386                        end
    387387                        %CHECK THAT ROTATION IS IN THE (X,Y) PLANE FOR 2D MODELS
    388                         if any(md.nodeonmacayeal),
    389                                 pos=find(sum(isnan(md.diagnostic_ref),2)==0  & md.nodeonmacayeal);
     388                        if md.dim==2,
     389                                pos=find(sum(isnan(md.diagnostic_ref),2)==0  & md.vertices_type==2);
    390390                                if any(md.diagnostic_ref(pos,3:5)~=0);
    391391                                        message(['model not consistent: model ' md.miscellaneous.name ' has problem with rotated spc. The rotation should be in the (x,y) plane for 2D diagnostic models (nodeonmacayeal)']);
  • issm/trunk/src/m/model/setelementstype.m

    r9641 r9654  
    7373nodeonhutter=zeros(md.numberofnodes,1);
    7474nodeonhutter(md.elements(find(hutterflag),:))=1;
    75 md.nodeonhutter=nodeonhutter;
    7675md.elements_type(find(hutterflag))=1;
    7776
Note: See TracChangeset for help on using the changeset viewer.