Changeset 9619


Ignore:
Timestamp:
Sep 6, 2011, 1:40:47 PM (15 years ago)
Author:
Mathieu Morlighem
Message:

Added rifts object

Location:
issm/trunk
Files:
3 added
2 deleted
38 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

    r9617 r9619  
    2424        FrictionPEnum,
    2525        FrictionQEnum,
     26        RiftsRiftstructEnum,
     27        RiftsNumriftsEnum,
    2628        HydrologySpcwatercolumnEnum,
    2729        HydrologyKnEnum,
    … …  
    350352        MinThermalConstraintsEnum,
    351353        NdtEnum,
    352         NumriftsEnum,
    353354        NumberOfElementsEnum,
    354355        NumberOfVerticesEnum,
    … …  
    425426        NodeOnHutterEnum,
    426427        ZEnum,
    427         RiftsEnum,
    428428        SpcthicknessEnum,
    429429        SpctemperatureEnum,

  • issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp

    r9617 r9619  
    2828                case FrictionPEnum : return "FrictionP";
    2929                case FrictionQEnum : return "FrictionQ";
     30                case RiftsRiftstructEnum : return "RiftsRiftstruct";
     31                case RiftsNumriftsEnum : return "RiftsNumrifts";
    3032                case HydrologySpcwatercolumnEnum : return "HydrologySpcwatercolumn";
    3133                case HydrologyKnEnum : return "HydrologyKn";
    … …  
    299301                case MinThermalConstraintsEnum : return "MinThermalConstraints";
    300302                case NdtEnum : return "Ndt";
    301                 case NumriftsEnum : return "Numrifts";
    302303                case NumberOfElementsEnum : return "NumberOfElements";
    303304                case NumberOfVerticesEnum : return "NumberOfVertices";
    … …  
    366367                case NodeOnHutterEnum : return "NodeOnHutter";
    367368                case ZEnum : return "Z";
    368                 case RiftsEnum : return "Rifts";
    369369                case SpcthicknessEnum : return "Spcthickness";
    370370                case SpctemperatureEnum : return "Spctemperature";

  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp

    r9522 r9619  
    4444        iomodel->Constant(&isstokes,IsstokesEnum);
    4545        iomodel->Constant(&ismacayealpattyn,IsmacayealpattynEnum);
    46         iomodel->Constant(&numrifts,NumriftsEnum);
     46        iomodel->Constant(&numrifts,RiftsNumriftsEnum);
    4747
    4848        /*Recover pointer: */
    … …  
    173173        /*Create Riffront loads for rifts: */
    174174        if(numrifts){
    175                 iomodel->FetchData(&riftinfo,&numriftsegments,NULL,RiftsEnum);
    176                 iomodel->FetchData(5,RiftsEnum,ThicknessEnum,BedEnum,SurfaceEnum,NodeOnIceShelfEnum);
     175                iomodel->FetchData(&riftinfo,&numriftsegments,NULL,RiftsRiftstructEnum);
     176                iomodel->FetchData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,NodeOnIceShelfEnum);
    177177                for(i=0;i<numriftsegments;i++){
    178178                        if(iomodel->my_elements[(int)*(riftinfo+RIFTINFOSIZE*i+2)-1]){
    … …  
    181181                        }
    182182                }
    183                 iomodel->DeleteData(5,RiftsEnum,ThicknessEnum,BedEnum,SurfaceEnum,NodeOnIceShelfEnum);
     183                iomodel->DeleteData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,NodeOnIceShelfEnum);
    184184                xfree((void**)&riftfront);
    185185        }

  • issm/trunk/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp

    r9522 r9619  
    5454        iomodel->Constant(&numberofvertices2d,NumberOfNodes2DEnum);
    5555        iomodel->Constant(&numlayers,NumlayersEnum);
    56         iomodel->Constant(&numrifts,NumriftsEnum);
     56        iomodel->Constant(&numrifts,RiftsNumriftsEnum);
    5757
    5858        /*First, check that partitioning has not yet been carryed out. Just check whether my_elements pointers is not already assigned a value: */
    … …  
    8787        /*Deal with rifts, they have to be included into one partition only, not several: */
    8888        if(numrifts){
    89                 iomodel->FetchData(&riftinfo,&numrifts,NULL,RiftsEnum);
     89                iomodel->FetchData(&riftinfo,&numrifts,NULL,RiftsRiftstructEnum);
    9090                for(i=0;i<numrifts;i++){
    9191                        el1=(int)*(riftinfo+RIFTINFOSIZE*i+2)-1; //matlab indexing to c indexing

  • issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp

    r9617 r9619  
    2626        else if (strcmp(name,"FrictionP")==0) return FrictionPEnum;
    2727        else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum;
     28        else if (strcmp(name,"RiftsRiftstruct")==0) return RiftsRiftstructEnum;
     29        else if (strcmp(name,"RiftsNumrifts")==0) return RiftsNumriftsEnum;
    2830        else if (strcmp(name,"HydrologySpcwatercolumn")==0) return HydrologySpcwatercolumnEnum;
    2931        else if (strcmp(name,"HydrologyKn")==0) return HydrologyKnEnum;
    … …  
    297299        else if (strcmp(name,"MinThermalConstraints")==0) return MinThermalConstraintsEnum;
    298300        else if (strcmp(name,"Ndt")==0) return NdtEnum;
    299         else if (strcmp(name,"Numrifts")==0) return NumriftsEnum;
    300301        else if (strcmp(name,"NumberOfElements")==0) return NumberOfElementsEnum;
    301302        else if (strcmp(name,"NumberOfVertices")==0) return NumberOfVerticesEnum;
    … …  
    364365        else if (strcmp(name,"NodeOnHutter")==0) return NodeOnHutterEnum;
    365366        else if (strcmp(name,"Z")==0) return ZEnum;
    366         else if (strcmp(name,"Rifts")==0) return RiftsEnum;
    367367        else if (strcmp(name,"Spcthickness")==0) return SpcthicknessEnum;
    368368        else if (strcmp(name,"Spctemperature")==0) return SpctemperatureEnum;

  • issm/trunk/src/c/objects/Loads/Riftfront.cpp

    r9522 r9619  
    6060
    6161        /*Ok, retrieve all the data needed to add a penalty between the two nodes: */
    62         el1=(int)*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+2);
    63         el2=(int)*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+3);
    64 
    65         node1=(int)*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+0);
    66         node2=(int)*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+1);
     62        el1=(int)*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+2);
     63        el2=(int)*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+3);
     64
     65        node1=(int)*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+0);
     66        node2=(int)*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+1);
    6767
    6868        /*id: */
    … …  
    8989        this->penalty_lock=penalty_lock;
    9090        this->material_converged=0;
    91         this->normal[0]=*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+4);
    92         this->normal[1]=*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+5);
    93         this->length=*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+6);
    94         this->fraction=*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+9);
    95         this->state=(int)*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+11);
     91        this->normal[0]=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+4);
     92        this->normal[1]=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+5);
     93        this->length=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+6);
     94        this->fraction=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+9);
     95        this->state=(int)*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+11);
    9696
    9797        //intialize inputs, and add as many inputs per element as requested:
    … …  
    9999               
    100100        riftfront_type=SegmentRiftfrontEnum;
    101         riftfront_fill = (int)*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+7);
    102         riftfront_friction=*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+8);
    103         riftfront_fractionincrement=*(iomodel->Data(RiftsEnum)+RIFTINFOSIZE*i+10);
     101        riftfront_fill = (int)*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+7);
     102        riftfront_friction=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+8);
     103        riftfront_fractionincrement=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+10);
    104104        riftfront_shelf=(bool)iomodel->Data(NodeOnIceShelfEnum)[node1-1];
    105105

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

    r9617 r9619  
    1919                 friction  = modelfield('default',0,'marshall',true);
    2020                 private   = modelfield('default',0,'marshall',false);
     21                 rifts     = modelfield('default',0,'marshall',true);
    2122                 hydrology = modelfield('default',0,'marshall',true);
    2223
    … …  
    8384                 segments             = modelfield('default',NaN,'marshall',false);
    8485                 segmentmarkers       = modelfield('default',NaN,'marshall',false);
    85                  rifts                = modelfield('default',NaN,'marshall',true,'preprocess','marshallrifts','format','DoubleMat','mattype',3);
    86                  riftproperties       = modelfield('default',NaN,'marshall',false);
    87                  numrifts             = modelfield('default',0,'marshall',true,'format','Integer');
    8886
    8987                 %Projections
    … …  
    379377                         disp(sprintf('   Parallel:'));
    380378                         disp(sprintf('%s%s%s','      Parallel options: type ''',inputname(1),'.parallel'' to display'));
    381                          if(md.numrifts)disp(sprintf('      rifts: %i',md.numrifts));end
    382379                         disp(sprintf('   Results:'));
    383380                         disp(sprintf('%s%s%s','      Results: type ''',inputname(1),'.res'' to display'));
    384                          if(md.numrifts)disp(sprintf('      rifts: %i',md.numrifts));end
    385381                 end
    386382                 %}}}
    … …  
    429425                         if isfield(structmd,'drag_p'), md.friction.p=structmd.drag_p; end
    430426                         if isfield(structmd,'drag_q'), md.friction.q=structmd.drag_q; end
     427                         if isfield(structmd,'numrifts'), md.rifts.numrifts=structmd.numrifts; end
     428                         if isfield(structmd,'rifts'), md.rifts.riftstruct=structmd.rifts; end
     429                         if isfield(structmd,'riftproperties'), md.rifts.riftproperties=structmd.riftproperties; end
     430                         if isfield(structmd,'bamg'), md.private.bamg=structmd.bamg; end
    431431
    432432                         %Field changes
    … …  
    539539                         md.friction=friction;
    540540                         md.private=private;
     541                         md.rifts=rifts;
    541542                         md.hydrology=hydrology;
    542543

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

    r9614 r9619  
    274274        end
    275275
    276         if isstruct(md.rifts)
     276        if isstruct(md.rifts.riftstruct)
    277277                error('bamg error message: rifts not supported yet. Do meshprocessrift AFTER bamg');
    278278        end

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

    r9617 r9619  
    143143%}}}
    144144%RIFTS{{{1
    145 if md.numrifts,
     145if md.rifts.numrifts,
    146146        if ~(md.dim==2),
    147147                message(['model not consistent: models with rifts are only supported in 2d for now!']);
    148148        end
    149         if ~isstruct(md.rifts),
     149        if ~isstruct(md.rifts.riftstruct),
    150150                message(['model not consistent: md.rifts should be a structure!']);
    151151        end
    … …  
    155155        end
    156156        %Check that rifts are filled with proper material
    157         checkvalues(md,{'rifts.fill'},[WaterEnum() AirEnum() IceEnum() MelangeEnum()]);
     157        checkvalues(md,{'rifts.riftstruct.fill'},[WaterEnum() AirEnum() IceEnum() MelangeEnum()]);
    158158else
    159         if ~isnans(md.rifts),
    160                 message(['model not consistent: md.rifts shoud be NaN since md.numrifts is 0!']);
     159        if ~isnans(md.rifts.riftstruct),
     160                message(['model not consistent: md.rifts.riftstruct shoud be NaN since md.rifts.numrifts is 0!']);
    161161        end
    162162end

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

    r9451 r9619  
    1616
    1717%Refine using TriMeshRefine
    18 %[md.elements,md.x,md.y,md.segments,md.rifts]=TriMeshRefine(md.elements,md.x,md.y,md.segments,md.rifts,areas,'yes');
    1918[md.elements,md.x,md.y,md.segments,md.segmentmarkers]=TriMeshRefine(md.elements,md.x,md.y,md.segments,md.segmentmarkers,areas,'yes');
    2019

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

    r8298 r9619  
    9494        %if we have rifts, we just messed them up, we need to recreate the segments that constitute those
    9595        %rifts, because the segments are used in YamsCall to freeze the rifts elements during refinement.
    96         if md.numrifts,
     96        if md.rifts.numrifts,
    9797                md.nodeconnectivity=NodeConnectivity(md.elements,md.numberofnodes);
    9898                md.elementconnectivity=ElementConnectivity(md.elements,md.nodeconnectivity);
    … …  
    136136
    137137%deal with rifts
    138 if md.numrifts,
     138if md.rifts.numrifts,
    139139        %first, recreate rift segments
    140140        md=meshyamsrecreateriftsegments(md);
    141141
    142142        %using the segments, recreate the penaltypairs
    143         for j=1:md.numrifts,
    144                 rift=md.rifts(j);
     143        for j=1:md.rifts.numrifts,
     144                rift=md.rifts.riftstruct(j);
    145145
    146146                %build normals and lengths of segments:
    … …  
    167167                rift.penaltypairs(:,6)=rift.penaltypairs(:,6)./norms;
    168168
    169                 md.rifts(j)=rift;
     169                md.rifts.riftstruct(j)=rift;
    170170        end
    171171

  • issm/trunk/src/m/model/mesh/rifts/meshaddrifts.m

    r9451 r9619  
    6262        md2.rifts=updateriftindexing(md2.rifts,elconv2,nodeconv2);
    6363       
    64         for i=1:md.numrifts,
    65                 md.rifts(i)=updateriftindexing(md.rifts(i),elconv,nodeconv);
     64        for i=1:md.rifts.numrifts,
     65                md.rifts.riftstruct(i)=updateriftindexing(md.rifts.riftstruct(i),elconv,nodeconv);
    6666        end
    6767       
    68         if md.numrifts==0,
    69                 md.rifts=md2.rifts;
    70                 md.numrifts=1;
     68        if md.rifts.numrifts==0,
     69                md.rifts.riftstruct=md2.rifts;
     70                md.rifts.numrifts=1;
    7171        else
    72                 md.rifts(end+1,1)=md2.rifts;
    73                 md.numrifts=md.numrifts+1;
     72                md.rifts.riftstruct(end+1,1)=md2.rifts;
     73                md.rifts.numrifts=md.rifts.numrifts+1;
    7474        end
    7575       

  • issm/trunk/src/m/model/mesh/rifts/meshprocessoutsiderifts.m

    r8298 r9619  
    99
    1010%go through rifts, and figure out which ones touch the domain outline
    11 for i=1:md.numrifts,
     11for i=1:md.rifts.numrifts,
    1212       
    1313        %first, flag nodes that belong to the domain outline
    1414        flags=ContourToMesh(md.elements,md.x,md.y,domainoutline,'node',0);
    1515
    16         rift=md.rifts(i);
     16        rift=md.rifts.riftstruct(i);
    1717        tips=rift.tips;
    1818        outsidetips=tips(find(flags(rift.tips)==0));
    … …  
    6565                newelements(pos)=num;
    6666                md.elements(elements,:)=newelements;
    67                 md.rifts(i).tips=[md.rifts(i).tips num];
     67                md.rifts.riftstruct(i).tips=[md.rifts.riftstruct(i).tips num];
    6868
    6969                %deal with segments
    … …  
    8787md.z=zeros(md.numberofnodes,1);
    8888md.nodeonboundary=zeros(length(md.x),1); md.nodeonboundary(md.segments(:,1:2))=1;
    89 md.numrifts=length(md.rifts);
     89md.rifts.numrifts=length(md.rifts.riftstruct);
    9090md.elements_type=3*ones(md.numberofelements,1);
    9191md.nodeonbed=ones(md.numberofnodes,1);

  • issm/trunk/src/m/model/mesh/rifts/meshprocessrifts.m

    r9616 r9619  
    2525
    2626%Call MEX file
    27 [md.elements,md.x,md.y,md.segments,md.segmentmarkers,md.rifts]=TriMeshProcessRifts(md.elements,md.x,md.y,md.segments,md.segmentmarkers);
    28 if ~isstruct(md.rifts),
     27[md.elements,md.x,md.y,md.segments,md.segmentmarkers,md.rifts.riftstruct]=TriMeshProcessRifts(md.elements,md.x,md.y,md.segments,md.segmentmarkers);
     28if ~isstruct(md.rifts.riftstruct),
    2929        error('TriMeshProcessRifts did not find any rift');
    3030end
    … …  
    3535md.z=zeros(md.numberofnodes,1);
    3636md.nodeonboundary=zeros(length(md.x),1); md.nodeonboundary(md.segments(:,1:2))=1;
    37 md.numrifts=length(md.rifts);
     37md.rifts.numrifts=length(md.rifts.riftstruct);
    3838md.elements_type=3*ones(md.numberofelements,1);
    3939md.nodeonbed=ones(md.numberofnodes,1);
    … …  
    4343
    4444%get coordinates of rift tips
    45 for i=1:md.numrifts,
    46         md.rifts(i).tip1coordinates=[md.x(md.rifts(i).tips(1)) md.y(md.rifts(i).tips(1))];
    47         md.rifts(i).tip2coordinates=[md.x(md.rifts(i).tips(2)) md.y(md.rifts(i).tips(2))];
     45for i=1:md.rifts.numrifts,
     46        md.rifts.riftstruct(i).tip1coordinates=[md.x(md.rifts.riftstruct(i).tips(1)) md.y(md.rifts.riftstruct(i).tips(1))];
     47        md.rifts.riftstruct(i).tip2coordinates=[md.x(md.rifts.riftstruct(i).tips(2)) md.y(md.rifts.riftstruct(i).tips(2))];
    4848end
    4949
    … …  
    5151flags=ContourToMesh(md.elements,md.x,md.y,domainoutline,'node',0);
    5252found=0;
    53 for i=1:md.numrifts,
    54         if flags(md.rifts(i).tips(1))==0,
     53for i=1:md.rifts.numrifts,
     54        if flags(md.rifts.riftstruct(i).tips(1))==0,
    5555                found=1;
    5656                break;
    5757        end
    58         if flags(md.rifts(i).tips(2))==0,
     58        if flags(md.rifts.riftstruct(i).tips(2))==0,
    5959                found=1;
    6060                break;

  • issm/trunk/src/m/model/mesh/rifts/meshyamsrecreateriftsegments.m

    r3260 r9619  
    33        %recreate rift segments: just used for yams. temporaroy routine.
    44        pos_record=[];
    5         if md.numrifts,
    6                 for i=1:md.numrifts,
    7                         rift=md.rifts(i);
     5        if md.rifts.numrifts,
     6                for i=1:md.rifts.numrifts,
     7                        rift=md.rifts.riftstruct(i);
    88
    99                        %closed rifts first:
    … …  
    3030                                        end
    3131                                end
    32                                 md.rifts(i).segments=riftsegs;
    33                                 md.rifts(i).tips=[tip1 tip2];
     32                                md.rifts.riftstruct(i).segments=riftsegs;
     33                                md.rifts.riftstruct(i).tips=[tip1 tip2];
    3434
    3535                        else
    … …  
    8181                                        end
    8282                                end
    83                                 md.rifts(i).segments=riftsegs;
    84                                 md.rifts(i).tips=[tip1 tip2(1) tip2(2)];
     83                                md.rifts.riftstruct(i).segments=riftsegs;
     84                                md.rifts.riftstruct(i).tips=[tip1 tip2(1) tip2(2)];
    8585
    8686                        end

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

    r8472 r9619  
    2020
    2121%plot rifts if present:
    22 if isstruct(md.rifts),
    23         for i=1:size(md.rifts,1),
    24                 segments=md.rifts(i).segments;
     22if isstruct(md.rifts.riftstruct),
     23        for i=1:size(md.rifts.riftstruct,1),
     24                segments=md.rifts.riftstruct(i).segments;
    2525                for j=1:size(segments,1),
    2626                        plot(x(segments(j,1:2)),y(segments(j,1:2)),'r.-');
    … …  
    2828                text(x(segments(floor(size(segments,1)/4),1)),y(segments(floor(size(segments,1)/4),1)),['Rift #' num2str(i)]);
    2929                %point out the tips
    30                 plot(x(md.rifts(i).tips(1)),y(md.rifts(i).tips(1)),'b*');
    31                 plot(x(md.rifts(i).tips(2)),y(md.rifts(i).tips(2)),'b*');
     30                plot(x(md.rifts.riftstruct(i).tips(1)),y(md.rifts.riftstruct(i).tips(1)),'b*');
     31                plot(x(md.rifts.riftstruct(i).tips(2)),y(md.rifts.riftstruct(i).tips(2)),'b*');
    3232        end
    3333end

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

    r9522 r9619  
    88
    99%check that there is something in riftproperties
    10 if isnan(md.riftproperties),
     10if isnan(md.rifts.riftstruct.riftproperties),
    1111        error('plot_riftfraction error message: field riftproperies is empty, run the model first')
    1212end
    … …  
    2727
    2828%complete the tips.
    29 for i=1:length(md.rifts),
    30         tips=md.rifts(i).tips;
     29for i=1:length(md.rifts.riftstruct),
     30        tips=md.rifts.riftstruct(i).tips;
    3131        fractions(tips)=1;
    3232end
    3333
    3434hold on;
    35 for i=1:length(md.rifts),
    36         segments=md.rifts(i).segments(:,1:2)';
     35for i=1:length(md.rifts.riftstruct),
     36        segments=md.rifts.riftstruct(i).segments(:,1:2)';
    3737        xc=x(segments(:));
    3838        yc=y(segments(:));

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

    r8472 r9619  
    2222isp2=0;
    2323
    24 if isstruct(md.rifts),
     24if isstruct(md.rifts.riftstruct),
    2525        %plot mesh boundaries
    2626        for i=1:size(md.segments,1),
    2727                h1=plot(x(md.segments(i,1:2)),y(md.segments(i,1:2)),'b-');
    2828        end
    29         for i=1:size(md.rifts,1),
    30                 penaltypairs=md.rifts(i).penaltypairs;
     29        for i=1:size(md.rifts.riftstruct,1),
     30                penaltypairs=md.rifts.riftstruct(i).penaltypairs;
    3131
    32                 segments=md.rifts(i).segments;
     32                segments=md.rifts.riftstruct(i).segments;
    3333                for j=1:size(segments,1),
    3434                        plot(x(segments(j,1:2)),y(segments(j,1:2)),'b-');
    … …  
    5858
    5959                %point out the tips
    60                 h2=plot(x(md.rifts(i).tips(1)),y(md.rifts(i).tips(1)),'g*');
    61                 plot(x(md.rifts(i).tips(2)),y(md.rifts(i).tips(2)),'g*');
     60                h2=plot(x(md.rifts.riftstruct(i).tips(1)),y(md.rifts.riftstruct(i).tips(1)),'g*');
     61                plot(x(md.rifts.riftstruct(i).tips(2)),y(md.rifts.riftstruct(i).tips(2)),'g*');
    6262        end
    6363        if strcmpi(getfieldvalue(options,'legend','on'),'on'),
    … …  
    7878
    7979%Now, plot rift vertices numbers.
    80 for i=1:size(md.rifts,1),
    81         penaltypairs=md.rifts(i).penaltypairs;
     80for i=1:size(md.rifts.riftstruct,1),
     81        penaltypairs=md.rifts.riftstruct(i).penaltypairs;
    8282
    8383        for j=1:size(penaltypairs,1),

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

    r8472 r9619  
    2121isp2=0;
    2222
    23 if isstruct(md.rifts),
     23if isstruct(md.rifts.riftstruct),
    2424        %plot mesh boundaries
    2525        for i=1:size(md.segments,1),
    2626                h1=plot(x(md.segments(i,1:2)),y(md.segments(i,1:2)),'b-');
    2727        end
    28         for i=1:size(md.rifts,1),
    29                 penaltypairs=md.rifts(i).penaltypairs;
     28        for i=1:size(md.rifts.riftstruct,1),
     29                penaltypairs=md.rifts.riftstruct(i).penaltypairs;
    3030
    31                 segments=md.rifts(i).segments;
     31                segments=md.rifts.riftstruct(i).segments;
    3232                for j=1:size(segments,1),
    3333                        plot(x(segments(j,1:2)),y(segments(j,1:2)),'b-');
    … …  
    5757
    5858                %point out the tips
    59                 h2=plot(x(md.rifts(i).tips(1)),y(md.rifts(i).tips(1)),'g*');
    60                 plot(x(md.rifts(i).tips(2)),y(md.rifts(i).tips(2)),'g*');
     59                h2=plot(x(md.rifts.riftstruct(i).tips(1)),y(md.rifts.riftstruct(i).tips(1)),'g*');
     60                plot(x(md.rifts.riftstruct(i).tips(2)),y(md.rifts.riftstruct(i).tips(2)),'g*');
    6161        end
    6262        if strcmpi(getfieldvalue(options,'legend','on'),'on'),

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

    r8472 r9619  
    1111        error('plot_riftvel error message: vx and vy do not have the right size'),
    1212end
    13 if ~isstruct(md.rifts),
     13if ~isstruct(md.rifts.riftstruct),
    1414        error('plot error message: no rifts available!');
    1515end
    … …  
    2323u=NaN*ones(md.numberofnodes,1);
    2424v=NaN*ones(md.numberofnodes,1);
    25 for i=1:md.numrifts,
    26         penaltypairs=md.rifts(i).penaltypairs(:,[1 2]);
    27         u(md.rifts(i).penaltypairs(:,1))=vx(penaltypairs(:,1))-vx(penaltypairs(:,2));
    28         v(md.rifts(i).penaltypairs(:,1))=vy(penaltypairs(:,1))-vy(penaltypairs(:,2));
     25for i=1:md.rifts.numrifts,
     26        penaltypairs=md.rifts.riftstruct(i).penaltypairs(:,[1 2]);
     27        u(md.rifts.riftstruct(i).penaltypairs(:,1))=vx(penaltypairs(:,1))-vx(penaltypairs(:,2));
     28        v(md.rifts.riftstruct(i).penaltypairs(:,1))=vy(penaltypairs(:,1))-vy(penaltypairs(:,2));
    2929end
    3030
    … …  
    6262        h1=plot(x(md.segments(i,1:2)),y(md.segments(i,1:2)),'b-');
    6363end
    64 for i=1:md.numrifts,
     64for i=1:md.rifts.numrifts,
    6565       
    6666        %get nodes on rift
    67         penaltypairs=md.rifts(i).penaltypairs;
     67        penaltypairs=md.rifts.riftstruct(i).penaltypairs;
    6868
    69         segments=md.rifts(i).segments;
     69        segments=md.rifts.riftstruct(i).segments;
    7070        for j=1:size(segments,1),
    7171                plot(x(segments(j,1:2)),y(segments(j,1:2)),'k-');
    … …  
    9090
    9191        %point out the tips
    92         h2=plot(x(md.rifts(i).tips(1)),y(md.rifts(i).tips(1)),'g*');
    93         plot(x(md.rifts(i).tips(2)),y(md.rifts(i).tips(2)),'g*');
    94         segments=md.rifts(i).segments(:,1:2);
     92        h2=plot(x(md.rifts.riftstruct(i).tips(1)),y(md.rifts.riftstruct(i).tips(1)),'g*');
     93        plot(x(md.rifts.riftstruct(i).tips(2)),y(md.rifts.riftstruct(i).tips(2)),'g*');
     94        segments=md.rifts.riftstruct(i).segments(:,1:2);
    9595end
    9696%legend

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

    r8472 r9619  
    1515%offset to separate rift flanks.
    1616offset=getfieldvalue(options,'offset',500);
    17 if isstruct(md.rifts),
     17if isstruct(md.rifts.riftstruct),
    1818       
    19         for i=1:md.numrifts,
    20                 penaltypairs=md.rifts(i).penaltypairs;
     19        for i=1:md.rifts.numrifts,
     20                penaltypairs=md.rifts.riftstruct(i).penaltypairs;
    2121
    2222                normal=zeros(2,1);
    … …  
    2727                        y(penaltypairs(j,1))=y(penaltypairs(j,1))-normal(2)*offset;
    2828                end
    29                 if length(md.rifts(i).tips)==3,
    30                         tip=md.rifts(i).tips(3);
     29                if length(md.rifts.riftstruct(i).tips)==3,
     30                        tip=md.rifts.riftstruct(i).tips(3);
    3131                        %who is tip connected to?
    3232                        if isconnected(md.elements,penaltypairs(1,1),tip),

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

    r8472 r9619  
    1111        error('plot_riftvel error message: vx and vy do not have the right size'),
    1212end
    13 if ~isstruct(md.rifts),
     13if ~isstruct(md.rifts.riftstruct),
    1414        error('plot error message: no rifts available!');
    1515end
    … …  
    1919u=NaN*ones(md.numberofnodes,1);
    2020v=NaN*ones(md.numberofnodes,1);
    21 for i=1:md.numrifts,
    22         penaltypairs=md.rifts(i).penaltypairs(:,[1 2]);
     21for i=1:md.rifts.numrifts,
     22        penaltypairs=md.rifts.riftstruct(i).penaltypairs(:,[1 2]);
    2323        u(penaltypairs(:))=md.vx(penaltypairs(:));
    2424        v(penaltypairs(:))=md.vy(penaltypairs(:));
    … …  
    5757end
    5858
    59 for i=1:size(md.rifts,1),
     59for i=1:size(md.rifts.riftstruct,1),
    6060        %get nodes on rift
    61         penaltypairs=md.rifts(i).penaltypairs;
     61        penaltypairs=md.rifts.riftstruct(i).penaltypairs;
    6262
    63         segments=md.rifts(i).segments;
     63        segments=md.rifts.riftstruct(i).segments;
    6464        for j=1:size(segments,1),
    6565                plot(x(segments(j,1:2)),y(segments(j,1:2)),'b-');
    … …  
    8484
    8585        %point out the tips
    86         h2=plot(x(md.rifts(i).tips(1)),y(md.rifts(i).tips(1)),'g*');
    87         plot(x(md.rifts(i).tips(2)),y(md.rifts(i).tips(2)),'g*');
    88         segments=md.rifts(i).segments(:,1:2);
     86        h2=plot(x(md.rifts.riftstruct(i).tips(1)),y(md.rifts.riftstruct(i).tips(1)),'g*');
     87        plot(x(md.rifts.riftstruct(i).tips(2)),y(md.rifts.riftstruct(i).tips(2)),'g*');
     88        segments=md.rifts.riftstruct(i).segments(:,1:2);
    8989end
    9090

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

    r9561 r9619  
    66
    77%deal with rifts.
    8 if isempty(md.rifts) | isnans(md.rifts),
    9         md.numrifts=0;
     8if isempty(md.rifts.riftstruct) | isnans(md.rifts.riftstruct),
     9        md.rifts.numrifts=0;
    1010else
    11         md.numrifts=numel(md.rifts);
     11        md.rifts.numrifts=numel(md.rifts.riftstruct);
    1212end
    1313

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

    r9612 r9619  
    3434                md.pressure=PatchToVec(md.results.DiagnosticSolution.Pressure);
    3535        end
    36         if md.numrifts,
     36        if md.rifts.numrifts,
    3737                if isfield(md.results.DiagnosticSolution,'riftproperties'),
    38                         md.riftproperties=md.results.DiagnosticSolution.riftproperties;
     38                        md.rifts.riftproperties=md.results.DiagnosticSolution.riftproperties;
    3939                end
    4040        end

  • issm/trunk/src/m/qmu/examples/all_parameters.m

    r4759 r9619  
    8787
    8888md.npart=10;
    89 md.numrifts=5;
     89md.rifts.numrifts=5;
    9090
    9191md.qmu

  • issm/trunk/src/m/qmu/setupdesign/setupriftsfriction.m

    r5215 r9619  
    33%we have several rifts.
    44
    5 for j=1:md.numrifts
     5for j=1:md.rifts.numrifts
    66        dvar(end+1)           =variables;
    77        dvar(end  ).descriptor=sprintf('%s%d',variables.descriptor,j);

  • issm/trunk/src/m/utils/Mesh/YamsCall.m

    r8298 r9619  
    5555       
    5656%Deal with rifts
    57 if md.numrifts,
     57if md.rifts.numrifts,
    5858       
    5959        %we have the list of triangles that make up the rift. keep those triangles around during refinement.
    6060        triangles=[];
    61         for i=1:md.numrifts,
     61        for i=1:md.rifts.numrifts,
    6262                triangles=[triangles md.rifts(i).segments(:,3)'];
    6363        end

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

    r9611 r9619  
    3636
    3737%Fields and tolerances to track changes
    38 field_names={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceMassBalance1', ...
    39         'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceMassBalance2', ...
    40         'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceMassBalance3', ...
    41         'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassBalance4', ...
    42         'Vx5','Vy5','Vel5','Pressure5','Bed5','Surface5','Thickness5','SurfaceMassBalance5'};
     38field_names={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ...
     39        'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ...
     40        'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', ...
     41        'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceforcingsMassBalance4', ...
     42        'Vx5','Vy5','Vel5','Pressure5','Bed5','Surface5','Thickness5','SurfaceforcingsMassBalance5'};
    4343field_tolerances={1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,...
    4444        1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,...
    … …  
    5454        PatchToVec(md.results.TransientSolution(400).Surface),...
    5555        PatchToVec(md.results.TransientSolution(400).Thickness),...
    56         PatchToVec(md.results.TransientSolution(400).SurfaceMassBalance),...
     56        PatchToVec(md.results.TransientSolution(400).SurfaceforcingsMassBalance),...
    5757        PatchToVec(md.results.TransientSolution(800).Vx),...
    5858        PatchToVec(md.results.TransientSolution(800).Vy),...
    … …  
    6262        PatchToVec(md.results.TransientSolution(800).Surface),...
    6363        PatchToVec(md.results.TransientSolution(800).Thickness),...
    64         PatchToVec(md.results.TransientSolution(800).SurfaceMassBalance),...
     64        PatchToVec(md.results.TransientSolution(800).SurfaceforcingsMassBalance),...
    6565        PatchToVec(md.results.TransientSolution(1200).Vx),...
    6666        PatchToVec(md.results.TransientSolution(1200).Vy),...
    … …  
    7070        PatchToVec(md.results.TransientSolution(1200).Surface),...
    7171        PatchToVec(md.results.TransientSolution(1200).Thickness),...
    72         PatchToVec(md.results.TransientSolution(1200).SurfaceMassBalance),...
     72        PatchToVec(md.results.TransientSolution(1200).SurfaceforcingsMassBalance),...
    7373        PatchToVec(md.results.TransientSolution(1600).Vx),...
    7474        PatchToVec(md.results.TransientSolution(1600).Vy),...
    … …  
    7878        PatchToVec(md.results.TransientSolution(1600).Surface),...
    7979        PatchToVec(md.results.TransientSolution(1600).Thickness),...
    80         PatchToVec(md.results.TransientSolution(1600).SurfaceMassBalance),...
     80        PatchToVec(md.results.TransientSolution(1600).SurfaceforcingsMassBalance),...
    8181        PatchToVec(md.results.TransientSolution(2000).Vx),...
    8282        PatchToVec(md.results.TransientSolution(2000).Vy),...
    … …  
    8686        PatchToVec(md.results.TransientSolution(2000).Surface),...
    8787        PatchToVec(md.results.TransientSolution(2000).Thickness),...
    88         PatchToVec(md.results.TransientSolution(2000).SurfaceMassBalance),...
     88        PatchToVec(md.results.TransientSolution(2000).SurfaceforcingsMassBalance),...
    8989        };
    9090
    … …  
    108108                thickness = [thickness PatchToVec(md.results.TransientSolution(t).Thickness)];
    109109                volume = [volume mean(md.results.TransientSolution(t).Thickness.value,2).*areas];
    110                 massbal = [massbal PatchToVec(md.results.TransientSolution(t).SurfaceMassBalance)];
     110                massbal = [massbal PatchToVec(md.results.TransientSolution(t).SurfaceforcingsMassBalance)];
    111111                velocity = [velocity PatchToVec(md.results.TransientSolution(t).Vel)];
    112112        end

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

    r9611 r9619  
    3737
    3838%Fields and tolerances to track changes
    39 field_names={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceMassBalance1', ...
    40         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceMassBalance2', ...
    41         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceMassBalance3', ...
    42         'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassBalance4', ...
    43         'Vx5','Vy5','Vz5','Vel5','Pressure5','Bed5','Surface5','Thickness5','SurfaceMassBalance5'};
     39field_names={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ...
     40        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ...
     41        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', ...
     42        'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceforcingsMassBalance4', ...
     43        'Vx5','Vy5','Vz5','Vel5','Pressure5','Bed5','Surface5','Thickness5','SurfaceforcingsMassBalance5'};
    4444field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    4545        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    … …  
    5656        PatchToVec(md.results.TransientSolution(400).Surface),...
    5757        PatchToVec(md.results.TransientSolution(400).Thickness),...
    58         PatchToVec(md.results.TransientSolution(400).SurfaceMassBalance),...
     58        PatchToVec(md.results.TransientSolution(400).SurfaceforcingsMassBalance),...
    5959        PatchToVec(md.results.TransientSolution(800).Vx),...
    6060        PatchToVec(md.results.TransientSolution(800).Vy),...
    … …  
    6565        PatchToVec(md.results.TransientSolution(800).Surface),...
    6666        PatchToVec(md.results.TransientSolution(800).Thickness),...
    67         PatchToVec(md.results.TransientSolution(800).SurfaceMassBalance),...
     67        PatchToVec(md.results.TransientSolution(800).SurfaceforcingsMassBalance),...
    6868        PatchToVec(md.results.TransientSolution(1200).Vx),...
    6969        PatchToVec(md.results.TransientSolution(1200).Vy),...
    … …  
    7474        PatchToVec(md.results.TransientSolution(1200).Surface),...
    7575        PatchToVec(md.results.TransientSolution(1200).Thickness),...
    76         PatchToVec(md.results.TransientSolution(1200).SurfaceMassBalance),...
     76        PatchToVec(md.results.TransientSolution(1200).SurfaceforcingsMassBalance),...
    7777        PatchToVec(md.results.TransientSolution(1600).Vx),...
    7878        PatchToVec(md.results.TransientSolution(1600).Vy),...
    … …  
    8383        PatchToVec(md.results.TransientSolution(1600).Surface),...
    8484        PatchToVec(md.results.TransientSolution(1600).Thickness),...
    85         PatchToVec(md.results.TransientSolution(1600).SurfaceMassBalance),...
     85        PatchToVec(md.results.TransientSolution(1600).SurfaceforcingsMassBalance),...
    8686        PatchToVec(md.results.TransientSolution(2000).Vx),...
    8787        PatchToVec(md.results.TransientSolution(2000).Vy),...
    … …  
    9292        PatchToVec(md.results.TransientSolution(2000).Surface),...
    9393        PatchToVec(md.results.TransientSolution(2000).Thickness),...
    94         PatchToVec(md.results.TransientSolution(2000).SurfaceMassBalance),...
     94        PatchToVec(md.results.TransientSolution(2000).SurfaceforcingsMassBalance),...
    9595        };
    9696
    … …  
    114114                thickness = [thickness PatchToVec(md.results.TransientSolution(t).Thickness)];
    115115                volume = [volume mean(md.results.TransientSolution(t).Thickness.value,2).*areas];
    116                 massbal = [massbal PatchToVec(md.results.TransientSolution(t).SurfaceMassBalance)];
     116                massbal = [massbal PatchToVec(md.results.TransientSolution(t).SurfaceforcingsMassBalance)];
    117117                velocity = [velocity PatchToVec(md.results.TransientSolution(t).Vel)];
    118118        end

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

    r8589 r9619  
    77
    88%rift settings
    9 md.rifts.fill=MelangeEnum();
    10 md.rifts.fraction=0;
     9md.rifts.riftstruct.fill=MelangeEnum();
     10md.rifts.riftstruct.fraction=0;
    1111md.penalty_lock=2;
    1212md.min_mechanical_constraints=0;
    13 md.rifts.fractionincrement=.1;
     13md.rifts.riftstruct.fractionincrement=.1;
    1414md=solve(md,DiagnosticSolutionEnum);
    1515

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

    r9607 r9619  
    2020
    2121%Fields and tolerances to track changes
    22 field_names={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceMassBalance1', ...
    23         'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceMassBalance2', ...
    24         'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceMassBalance3', ...
    25         'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassBalance4'};
     22field_names={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ...
     23        'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ...
     24        'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', ...
     25        'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceforcingsMassBalance4'};
    2626field_tolerances={1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
    2727        1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
    … …  
    3737        PatchToVec(md.results.TransientSolution(1).Surface),...
    3838        PatchToVec(md.results.TransientSolution(1).Thickness),...
    39         PatchToVec(md.results.TransientSolution(1).SurfaceMassBalance),...
     39        PatchToVec(md.results.TransientSolution(1).SurfaceforcingsMassBalance),...
    4040        PatchToVec(md.results.TransientSolution(2).Vx),...
    4141        PatchToVec(md.results.TransientSolution(2).Vy),...
    … …  
    4545        PatchToVec(md.results.TransientSolution(2).Surface),...
    4646        PatchToVec(md.results.TransientSolution(2).Thickness),...
    47         PatchToVec(md.results.TransientSolution(2).SurfaceMassBalance),...
     47        PatchToVec(md.results.TransientSolution(2).SurfaceforcingsMassBalance),...
    4848        PatchToVec(md.results.TransientSolution(3).Vx),...
    4949        PatchToVec(md.results.TransientSolution(3).Vy),...
    … …  
    5353        PatchToVec(md.results.TransientSolution(3).Surface),...
    5454        PatchToVec(md.results.TransientSolution(3).Thickness),...
    55         PatchToVec(md.results.TransientSolution(3).SurfaceMassBalance),...
     55        PatchToVec(md.results.TransientSolution(3).SurfaceforcingsMassBalance),...
    5656        PatchToVec(md.results.TransientSolution(4).Vx),...
    5757        PatchToVec(md.results.TransientSolution(4).Vy),...
    … …  
    6161        PatchToVec(md.results.TransientSolution(4).Surface),...
    6262        PatchToVec(md.results.TransientSolution(4).Thickness),...
    63         PatchToVec(md.results.TransientSolution(4).SurfaceMassBalance),...
     63        PatchToVec(md.results.TransientSolution(4).SurfaceforcingsMassBalance),...
    6464        };

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

    r9607 r9619  
    2020
    2121%Fields and tolerances to track changes
    22 field_names={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceMassBalance1', ...
    23         'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceMassBalance2', ...
    24         'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceMassBalance3', ...
    25         'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassBalance4'};
     22field_names={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ...
     23        'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ...
     24        'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', ...
     25        'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceforcingsMassBalance4'};
    2626field_tolerances={1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
    2727        1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
    … …  
    3737        PatchToVec(md.results.TransientSolution(1).Surface),...
    3838        PatchToVec(md.results.TransientSolution(1).Thickness),...
    39         PatchToVec(md.results.TransientSolution(1).SurfaceMassBalance),...
     39        PatchToVec(md.results.TransientSolution(1).SurfaceforcingsMassBalance),...
    4040        PatchToVec(md.results.TransientSolution(2).Vx),...
    4141        PatchToVec(md.results.TransientSolution(2).Vy),...
    … …  
    4545        PatchToVec(md.results.TransientSolution(2).Surface),...
    4646        PatchToVec(md.results.TransientSolution(2).Thickness),...
    47         PatchToVec(md.results.TransientSolution(2).SurfaceMassBalance),...
     47        PatchToVec(md.results.TransientSolution(2).SurfaceforcingsMassBalance),...
    4848        PatchToVec(md.results.TransientSolution(3).Vx),...
    4949        PatchToVec(md.results.TransientSolution(3).Vy),...
    … …  
    5353        PatchToVec(md.results.TransientSolution(3).Surface),...
    5454        PatchToVec(md.results.TransientSolution(3).Thickness),...
    55         PatchToVec(md.results.TransientSolution(3).SurfaceMassBalance),...
     55        PatchToVec(md.results.TransientSolution(3).SurfaceforcingsMassBalance),...
    5656        PatchToVec(md.results.TransientSolution(4).Vx),...
    5757        PatchToVec(md.results.TransientSolution(4).Vy),...
    … …  
    6161        PatchToVec(md.results.TransientSolution(4).Surface),...
    6262        PatchToVec(md.results.TransientSolution(4).Thickness),...
    63         PatchToVec(md.results.TransientSolution(4).SurfaceMassBalance),...
     63        PatchToVec(md.results.TransientSolution(4).SurfaceforcingsMassBalance),...
    6464        };

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

    r9607 r9619  
    2020
    2121%Fields and tolerances to track changes
    22 field_names={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceMassBalance1', ...
    23         'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceMassBalance2', ...
    24         'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceMassBalance3', ...
    25         'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassBalance4'};
     22field_names={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ...
     23        'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ...
     24        'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', ...
     25        'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceforcingsMassBalance4'};
    2626field_tolerances={1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
    2727        1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
    … …  
    3737        PatchToVec(md.results.TransientSolution(1).Surface),...
    3838        PatchToVec(md.results.TransientSolution(1).Thickness),...
    39         PatchToVec(md.results.TransientSolution(1).SurfaceMassBalance),...
     39        PatchToVec(md.results.TransientSolution(1).SurfaceforcingsMassBalance),...
    4040        PatchToVec(md.results.TransientSolution(2).Vx),...
    4141        PatchToVec(md.results.TransientSolution(2).Vy),...
    … …  
    4545        PatchToVec(md.results.TransientSolution(2).Surface),...
    4646        PatchToVec(md.results.TransientSolution(2).Thickness),...
    47         PatchToVec(md.results.TransientSolution(2).SurfaceMassBalance),...
     47        PatchToVec(md.results.TransientSolution(2).SurfaceforcingsMassBalance),...
    4848        PatchToVec(md.results.TransientSolution(3).Vx),...
    4949        PatchToVec(md.results.TransientSolution(3).Vy),...
    … …  
    5353        PatchToVec(md.results.TransientSolution(3).Surface),...
    5454        PatchToVec(md.results.TransientSolution(3).Thickness),...
    55         PatchToVec(md.results.TransientSolution(3).SurfaceMassBalance),...
     55        PatchToVec(md.results.TransientSolution(3).SurfaceforcingsMassBalance),...
    5656        PatchToVec(md.results.TransientSolution(4).Vx),...
    5757        PatchToVec(md.results.TransientSolution(4).Vy),...
    … …  
    6161        PatchToVec(md.results.TransientSolution(4).Surface),...
    6262        PatchToVec(md.results.TransientSolution(4).Thickness),...
    63         PatchToVec(md.results.TransientSolution(4).SurfaceMassBalance),...
     63        PatchToVec(md.results.TransientSolution(4).SurfaceforcingsMassBalance),...
    6464        };

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

    r9607 r9619  
    2020
    2121%Fields and tolerances to track changes
    22 field_names={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceMassBalance1', ...
    23         'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceMassBalance2', ...
    24         'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceMassBalance3', ...
    25         'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassBalance4'};
     22field_names={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ...
     23        'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ...
     24        'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', ...
     25        'Vx4','Vy4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceforcingsMassBalance4'};
    2626field_tolerances={1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
    2727        1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
    … …  
    3737        PatchToVec(md.results.TransientSolution(1).Surface),...
    3838        PatchToVec(md.results.TransientSolution(1).Thickness),...
    39         PatchToVec(md.results.TransientSolution(1).SurfaceMassBalance),...
     39        PatchToVec(md.results.TransientSolution(1).SurfaceforcingsMassBalance),...
    4040        PatchToVec(md.results.TransientSolution(2).Vx),...
    4141        PatchToVec(md.results.TransientSolution(2).Vy),...
    … …  
    4545        PatchToVec(md.results.TransientSolution(2).Surface),...
    4646        PatchToVec(md.results.TransientSolution(2).Thickness),...
    47         PatchToVec(md.results.TransientSolution(2).SurfaceMassBalance),...
     47        PatchToVec(md.results.TransientSolution(2).SurfaceforcingsMassBalance),...
    4848        PatchToVec(md.results.TransientSolution(3).Vx),...
    4949        PatchToVec(md.results.TransientSolution(3).Vy),...
    … …  
    5353        PatchToVec(md.results.TransientSolution(3).Surface),...
    5454        PatchToVec(md.results.TransientSolution(3).Thickness),...
    55         PatchToVec(md.results.TransientSolution(3).SurfaceMassBalance),...
     55        PatchToVec(md.results.TransientSolution(3).SurfaceforcingsMassBalance),...
    5656        PatchToVec(md.results.TransientSolution(4).Vx),...
    5757        PatchToVec(md.results.TransientSolution(4).Vy),...
    … …  
    6161        PatchToVec(md.results.TransientSolution(4).Surface),...
    6262        PatchToVec(md.results.TransientSolution(4).Thickness),...
    63         PatchToVec(md.results.TransientSolution(4).SurfaceMassBalance),...
     63        PatchToVec(md.results.TransientSolution(4).SurfaceforcingsMassBalance),...
    6464        };

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

    r9607 r9619  
    2121
    2222%Fields and tolerances to track changes
    23 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceMassBalance1', ...
    24         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceMassBalance2', ...
    25         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceMassBalance3',...
     23field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ...
     24        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ...
     25        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3',...
    2626        'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassbalance4'};
    2727field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    … …  
    3939        PatchToVec(md.results.TransientSolution(1).Surface),...
    4040        PatchToVec(md.results.TransientSolution(1).Thickness),...
    41         PatchToVec(md.results.TransientSolution(1).SurfaceMassBalance),...
     41        PatchToVec(md.results.TransientSolution(1).SurfaceforcingsMassBalance),...
    4242        PatchToVec(md.results.TransientSolution(2).Vx),...
    4343        PatchToVec(md.results.TransientSolution(2).Vy),...
    … …  
    4848        PatchToVec(md.results.TransientSolution(2).Surface),...
    4949        PatchToVec(md.results.TransientSolution(2).Thickness),...
    50         PatchToVec(md.results.TransientSolution(2).SurfaceMassBalance),...
     50        PatchToVec(md.results.TransientSolution(2).SurfaceforcingsMassBalance),...
    5151        PatchToVec(md.results.TransientSolution(3).Vx),...
    5252        PatchToVec(md.results.TransientSolution(3).Vy),...
    … …  
    5757        PatchToVec(md.results.TransientSolution(3).Surface),...
    5858        PatchToVec(md.results.TransientSolution(3).Thickness),...
    59         PatchToVec(md.results.TransientSolution(3).SurfaceMassBalance),...
     59        PatchToVec(md.results.TransientSolution(3).SurfaceforcingsMassBalance),...
    6060        PatchToVec(md.results.TransientSolution(4).Vx),...
    6161        PatchToVec(md.results.TransientSolution(4).Vy),...
    … …  
    6666        PatchToVec(md.results.TransientSolution(4).Surface),...
    6767        PatchToVec(md.results.TransientSolution(4).Thickness),...
    68         PatchToVec(md.results.TransientSolution(4).SurfaceMassBalance),...
     68        PatchToVec(md.results.TransientSolution(4).SurfaceforcingsMassBalance),...
    6969        };

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

    r9607 r9619  
    2121
    2222%Fields and tolerances to track changes
    23 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceMassBalance1', ...
    24         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceMassBalance2', ...
    25         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceMassBalance3',...
     23field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ...
     24        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ...
     25        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3',...
    2626        'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassbalance4'};
    2727field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    … …  
    3939        PatchToVec(md.results.TransientSolution(1).Surface),...
    4040        PatchToVec(md.results.TransientSolution(1).Thickness),...
    41         PatchToVec(md.results.TransientSolution(1).SurfaceMassBalance),...
     41        PatchToVec(md.results.TransientSolution(1).SurfaceforcingsMassBalance),...
    4242        PatchToVec(md.results.TransientSolution(2).Vx),...
    4343        PatchToVec(md.results.TransientSolution(2).Vy),...
    … …  
    4848        PatchToVec(md.results.TransientSolution(2).Surface),...
    4949        PatchToVec(md.results.TransientSolution(2).Thickness),...
    50         PatchToVec(md.results.TransientSolution(2).SurfaceMassBalance),...
     50        PatchToVec(md.results.TransientSolution(2).SurfaceforcingsMassBalance),...
    5151        PatchToVec(md.results.TransientSolution(3).Vx),...
    5252        PatchToVec(md.results.TransientSolution(3).Vy),...
    … …  
    5757        PatchToVec(md.results.TransientSolution(3).Surface),...
    5858        PatchToVec(md.results.TransientSolution(3).Thickness),...
    59         PatchToVec(md.results.TransientSolution(3).SurfaceMassBalance),...
     59        PatchToVec(md.results.TransientSolution(3).SurfaceforcingsMassBalance),...
    6060        PatchToVec(md.results.TransientSolution(4).Vx),...
    6161        PatchToVec(md.results.TransientSolution(4).Vy),...
    … …  
    6666        PatchToVec(md.results.TransientSolution(4).Surface),...
    6767        PatchToVec(md.results.TransientSolution(4).Thickness),...
    68         PatchToVec(md.results.TransientSolution(4).SurfaceMassBalance),...
     68        PatchToVec(md.results.TransientSolution(4).SurfaceforcingsMassBalance),...
    6969        };

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

    r9607 r9619  
    2121
    2222%Fields and tolerances to track changes
    23 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceMassBalance1', ...
    24         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceMassBalance2', ...
    25         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceMassBalance3',...
     23field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ...
     24        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ...
     25        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3',...
    2626        'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassbalance4'};
    2727field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    … …  
    3939        PatchToVec(md.results.TransientSolution(1).Surface),...
    4040        PatchToVec(md.results.TransientSolution(1).Thickness),...
    41         PatchToVec(md.results.TransientSolution(1).SurfaceMassBalance),...
     41        PatchToVec(md.results.TransientSolution(1).SurfaceforcingsMassBalance),...
    4242        PatchToVec(md.results.TransientSolution(2).Vx),...
    4343        PatchToVec(md.results.TransientSolution(2).Vy),...
    … …  
    4848        PatchToVec(md.results.TransientSolution(2).Surface),...
    4949        PatchToVec(md.results.TransientSolution(2).Thickness),...
    50         PatchToVec(md.results.TransientSolution(2).SurfaceMassBalance),...
     50        PatchToVec(md.results.TransientSolution(2).SurfaceforcingsMassBalance),...
    5151        PatchToVec(md.results.TransientSolution(3).Vx),...
    5252        PatchToVec(md.results.TransientSolution(3).Vy),...
    … …  
    5757        PatchToVec(md.results.TransientSolution(3).Surface),...
    5858        PatchToVec(md.results.TransientSolution(3).Thickness),...
    59         PatchToVec(md.results.TransientSolution(3).SurfaceMassBalance),...
     59        PatchToVec(md.results.TransientSolution(3).SurfaceforcingsMassBalance),...
    6060        PatchToVec(md.results.TransientSolution(4).Vx),...
    6161        PatchToVec(md.results.TransientSolution(4).Vy),...
    … …  
    6666        PatchToVec(md.results.TransientSolution(4).Surface),...
    6767        PatchToVec(md.results.TransientSolution(4).Thickness),...
    68         PatchToVec(md.results.TransientSolution(4).SurfaceMassBalance),...
     68        PatchToVec(md.results.TransientSolution(4).SurfaceforcingsMassBalance),...
    6969        };

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

    r9607 r9619  
    2121
    2222%Fields and tolerances to track changes
    23 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceMassBalance1', ...
    24         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceMassBalance2', ...
    25         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceMassBalance3',...
     23field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ...
     24        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ...
     25        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3',...
    2626        'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassbalance4'};
    2727field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    … …  
    3939        PatchToVec(md.results.TransientSolution(1).Surface),...
    4040        PatchToVec(md.results.TransientSolution(1).Thickness),...
    41         PatchToVec(md.results.TransientSolution(1).SurfaceMassBalance),...
     41        PatchToVec(md.results.TransientSolution(1).SurfaceforcingsMassBalance),...
    4242        PatchToVec(md.results.TransientSolution(2).Vx),...
    4343        PatchToVec(md.results.TransientSolution(2).Vy),...
    … …  
    4848        PatchToVec(md.results.TransientSolution(2).Surface),...
    4949        PatchToVec(md.results.TransientSolution(2).Thickness),...
    50         PatchToVec(md.results.TransientSolution(2).SurfaceMassBalance),...
     50        PatchToVec(md.results.TransientSolution(2).SurfaceforcingsMassBalance),...
    5151        PatchToVec(md.results.TransientSolution(3).Vx),...
    5252        PatchToVec(md.results.TransientSolution(3).Vy),...
    … …  
    5757        PatchToVec(md.results.TransientSolution(3).Surface),...
    5858        PatchToVec(md.results.TransientSolution(3).Thickness),...
    59         PatchToVec(md.results.TransientSolution(3).SurfaceMassBalance),...
     59        PatchToVec(md.results.TransientSolution(3).SurfaceforcingsMassBalance),...
    6060        PatchToVec(md.results.TransientSolution(4).Vx),...
    6161        PatchToVec(md.results.TransientSolution(4).Vy),...
    … …  
    6666        PatchToVec(md.results.TransientSolution(4).Surface),...
    6767        PatchToVec(md.results.TransientSolution(4).Thickness),...
    68         PatchToVec(md.results.TransientSolution(4).SurfaceMassBalance),...
     68        PatchToVec(md.results.TransientSolution(4).SurfaceforcingsMassBalance),...
    6969        };
Note: See TracChangeset for help on using the changeset viewer.