Changeset 11027


Ignore:
Timestamp:
12/09/11 20:36:51 (13 years ago)
Author:
Eric.Larour
Message:

merged trunk-jpl and trunk for revision 11026

Location:
issm/trunk
Files:
8 deleted
322 edited
8 copied

Legend:

Unmodified
Added
Removed

  • issm/trunk

  • issm/trunk/cron/cronfiles/linux_cronfile

    r10981 r11027  
    121200 23 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_nightly
    131300 23 * * 6   cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_validation
     1400 23 * * 7   cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_ucitrunk

  • issm/trunk/examples/SquareIceShelf/runme.m

    r9947 r11027  
    11md=model;
    2 md=setmesh(md,'DomainOutline.exp',100000);
     2md=triangle(md,'DomainOutline.exp',100000);
    33md=setmask(md,'all','');
    44md=parameterize(md,'Square.par');

  • issm/trunk/externalpackages/mpich2

    • Property svn:ignore

      •  

        old new  
        22src
        33configure.sh
        4 .ignore.txt
         4Examples.Makefile.patch
         5mpicxx.h.patch

  • issm/trunk/externalpackages/vim/addons/vimrc

    r10119 r11027  
    211211                        \\begin{equation}
    212212                        \<CR>\end{equation}<up><C-R>=Eatchar('\s')<CR>
     213au BufRead,BufNewFile *.tex iab IT
     214                        \\begin{itemize}
     215                        \<CR>\item
     216                        \<CR>\end{itemize}<up><C-R>=Eatchar('\s')<CR>
     217au BufRead,BufNewFile *.tex iab EN
     218                        \\begin{enumerate}
     219                        \<CR>\item
     220                        \<CR>\end{enumerate}<up><C-R>=Eatchar('\s')<CR>
    213221au BufRead,BufNewFile *.tex ab (()) \left( \right)
    214222"}}}

  • issm/trunk/src/c/Container/Elements.cpp

    r10981 r11027  
    164164/*}}}*/
    165165/*FUNCTION Elements::ToResults{{{1*/
    166 void Elements::ToResults(Results* results,Parameters* parameters,int step, double time){
     166void Elements::ToResults(Results* results,Parameters* parameters){
    167167
    168168        extern int my_rank;
    … …  
    170170        Patch  *patch        = NULL;
    171171        int    *resultsenums = NULL;
     172        int    *resultssizes  = NULL;
     173        int    *resultssteps  = NULL;
     174        double *resultstimes = NULL;
    172175        double *vector_serial= NULL;
    173176        Vec     vector       = NULL;
    174177        bool   io_gather;
    175178        bool   results_as_patches;
    176         int    numberofvertices;
    177         int    numberofresults;
     179        int    numberofvertices,numberofelements;
     180        int    numberofresults,vectorsize;
    178181
    179182        /*Recover parameters: */
    … …  
    181184        parameters->FindParam(&results_as_patches,SettingsResultsAsPatchesEnum);
    182185        parameters->FindParam(&numberofvertices,MeshNumberofverticesEnum);
     186        parameters->FindParam(&numberofelements,MeshNumberofelementsEnum);
    183187
    184188        if(!results_as_patches){
    185189                /*No patch here, we prepare vectors*/
    186190
    187                 /*OK, see what the first element of this partition has in stock (this is common to all partitions)*/
    188                 Element* element=(Element*)this->GetObjectByOffset(0);
    189                 element->ListResultsEnums(&resultsenums,&numberofresults);
     191                /*see what the first element of this partition has in stock (this is common to all partitions)*/
     192                if(my_rank==0){
     193                        if(this->Size()==0) _error_("Cannot write results because first partition has no element. Maybe too many cpus were requested");
     194                        Element* element=(Element*)this->GetObjectByOffset(0);
     195                        element->ListResultsInfo(&resultsenums,&resultssizes,&resultstimes,&resultssteps,&numberofresults);
     196                }
     197                MPI_Bcast(&numberofresults,1,MPI_DOUBLE,0,MPI_COMM_WORLD);
     198
     199                /*Get out if there is no results. Otherwise broadcast info*/
     200                if(!numberofresults) return;
     201                if(my_rank!=0){
     202                        resultsenums=(int*)xmalloc(numberofresults*sizeof(int));
     203                        resultssizes=(int*)xmalloc(numberofresults*sizeof(int));
     204                        resultstimes=(double*)xmalloc(numberofresults*sizeof(double));
     205                        resultssteps=(int*)xmalloc(numberofresults*sizeof(int));
     206                }
     207                MPI_Bcast(resultsenums,numberofresults,MPI_INT,0,MPI_COMM_WORLD);
     208                MPI_Bcast(resultssizes,numberofresults,MPI_INT,0,MPI_COMM_WORLD);
     209                MPI_Bcast(resultstimes,numberofresults,MPI_DOUBLE,0,MPI_COMM_WORLD);
     210                MPI_Bcast(resultssteps,numberofresults,MPI_INT,0,MPI_COMM_WORLD);
    190211
    191212                /*Loop over all results and get nodal vector*/
    … …  
    193214
    194215                        /*Get vector for result number i*/
    195                         vector=NewVec(numberofvertices);
     216                        if(resultssizes[i]==P1Enum)      vectorsize=numberofvertices;
     217                        else if(resultssizes[i]==P0Enum) vectorsize=numberofelements;
     218                        else _error_("Unkown result size: %s",EnumToStringx(resultssizes[i]));
     219                        vector=NewVec(vectorsize);
     220
    196221                        for(int j=0;j<this->Size();j++){
    197222                                Element* element=(Element*)this->GetObjectByOffset(j);
    198                                 element->GetVectorFromResults(vector,resultsenums[i]);
     223                                element->GetVectorFromResults(vector,i,resultssizes[i]);
    199224                        }
    200225                        VecAssemblyBegin(vector);
    … …  
    205230                        if(my_rank==0){
    206231                                /*No need to add this vector for all cpus*/
    207                                 results->AddObject(new DoubleVecExternalResult(results->Size()+1,resultsenums[i],vector_serial,numberofvertices,step,time));
     232                                results->AddObject(new DoubleVecExternalResult(results->Size()+1,resultsenums[i],vector_serial,vectorsize,resultssteps[i],resultstimes[i]));
    208233                        }
    209234
    … …  
    224249                /*create result object and add to results dataset:*/
    225250                if (patch->maxvertices && patch->maxnodes){
    226                         results->AddObject(new IntExternalResult(results->Size()+1,PatchVerticesEnum,patch->maxvertices,step,time));
    227                         results->AddObject(new IntExternalResult(results->Size()+1,PatchNodesEnum,   patch->maxnodes,step,time));
    228                         results->AddObject(new DoubleMatExternalResult(results->Size()+1,PatchEnum,patch->values,patch->numrows,patch->numcols,step,time));
     251                        results->AddObject(new IntExternalResult(results->Size()+1,PatchVerticesEnum,patch->maxvertices,1,0));
     252                        results->AddObject(new IntExternalResult(results->Size()+1,PatchNodesEnum,   patch->maxnodes,1,0));
     253                        results->AddObject(new DoubleMatExternalResult(results->Size()+1,PatchEnum,  patch->values,patch->numrows,patch->numcols,1,0));
    229254                }
    230255        }
    … …  
    232257        /*Free ressources:*/
    233258        xfree((void**)&resultsenums);
     259        xfree((void**)&resultssizes);
     260        xfree((void**)&resultstimes);
     261        xfree((void**)&resultssteps);
    234262        delete patch;
    235263}

  • issm/trunk/src/c/Container/Elements.h

    r10522 r11027  
    3030                void ProcessResultsUnits(void);
    3131                void SetCurrentConfiguration(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters);
    32                 void ToResults(Results* results,Parameters* parameters,int step, double time);
     32                void ToResults(Results* results,Parameters* parameters);
    3333                Patch* ResultsToPatch(void);
    3434                int   NumberOfElements(void);

  • issm/trunk/src/c/Container/Results.cpp

    r10522 r11027  
    136136
    137137        /*Fill each field: */
    138         for(i=0;i<nfields-2;i++){ //do not include the last one used for time
     138        for(i=0;i<this->Size();i++){ //do not include the last one used for time
    139139                ExternalResult* result=(ExternalResult*)this->GetObjectByOffset(i);
    140140                result->SetMatlabField(dataref);

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

    r10522 r11027  
    4747        iomodel->FetchData(4,MeshElementsEnum,MeshElementconnectivityEnum,MaterialsRheologyBEnum,MaterialsRheologyNEnum);
    4848        #ifdef _HAVE_THREED_
    49         if(dim==3)          iomodel->FetchData(2,MeshUpperelementsEnum,MeshLowerelementsEnum);
     49        if(dim==3)iomodel->FetchData(2,MeshUpperelementsEnum,MeshLowerelementsEnum);
    5050        #endif
    5151        if(control_analysis)iomodel->FetchData(3,InversionControlParametersEnum,InversionMinParametersEnum,InversionMaxParametersEnum);
    … …  
    7676
    7777        /*Fetch data:*/
    78         iomodel->FetchData(5,MeshXEnum,MeshYEnum,MeshZEnum,BedEnum,ThicknessEnum);
     78        iomodel->FetchData(6,MeshElementsEnum,MeshXEnum,MeshYEnum,MeshZEnum,BedEnum,ThicknessEnum);
     79        CreateNumberNodeToElementConnectivity(iomodel);
    7980       
    8081        for (i=0;i<numberofvertices;i++){
    … …  
    8990
    9091        /*Free data: */
    91         iomodel->DeleteData(5,MeshXEnum,MeshYEnum,MeshZEnum,BedEnum,ThicknessEnum);
     92        iomodel->DeleteData(6,MeshElementsEnum,MeshXEnum,MeshYEnum,MeshZEnum,BedEnum,ThicknessEnum);
    9293
    9394        /*Assign output pointer: */

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

    r9733 r11027  
    2727        /*output*/
    2828        int* connectivity=NULL;
     29
     30        /*Check that this has not been done yet*/
     31        if(iomodel->numbernodetoelementconnectivity) return;
    2932
    3033        /*Fetch parameters: */

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

    r9733 r11027  
    5959        iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum);
    6060        iomodel->FetchDataToInput(elements,MaterialsRheologyNEnum);
    61         iomodel->FetchDataToInput(elements,VxEnum,InversionVxObsEnum,0);
    62         iomodel->FetchDataToInput(elements,VyEnum,InversionVyObsEnum,0);
    63         iomodel->FetchDataToInput(elements,BathymetryEnum);
     61        iomodel->FetchDataToInput(elements,VxEnum);
     62        iomodel->FetchDataToInput(elements,VyEnum);
    6463
    6564        if (dim==3){

  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp

    r10522 r11027  
    4545        /*First fetch data: */
    4646        iomodel->FetchData(7,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,MeshElementsEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum);
    47         CreateNumberNodeToElementConnectivity(iomodel);
    4847
    4948        for (i=0;i<numberofvertices;i++){

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

    r9761 r11027  
    1919void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads, Parameters** pparameters, FILE* IOMODEL,const int solution_type,const int nummodels,const int* analysis_type_list){
    2020
    21         int i;
    22         int analysis_type;
    23         int dim;
    24         int verbose;
     21        int   i,analysis_type,dim,verbose;
     22        bool  isthermal,isprognostic,isdiagnostic,isgroundingline;
    2523       
    2624        /*output: */
    … …  
    4038        iomodel->Constant(&dim,MeshDimensionEnum);
    4139        iomodel->Constant(&verbose,VerboseEnum);
     40        iomodel->Constant(&isthermal,TransientIsthermalEnum);
     41        iomodel->Constant(&isprognostic,TransientIsprognosticEnum);
     42        iomodel->Constant(&isdiagnostic,TransientIsdiagnosticEnum);
     43        iomodel->Constant(&isgroundingline,TransientIsgroundinglineEnum);
    4244       
    4345        SetVerbosityLevel(verbose);
    … …  
    5052                if(solution_type==TransientSolutionEnum && analysis_type==ThermalAnalysisEnum && dim==2) continue;
    5153                if(solution_type==TransientSolutionEnum && analysis_type==MeltingAnalysisEnum && dim==2) continue;
     54                if(solution_type==TransientSolutionEnum && analysis_type==ThermalAnalysisEnum && isthermal==false) continue;
     55                if(solution_type==TransientSolutionEnum && analysis_type==MeltingAnalysisEnum && isthermal==false) continue;
     56                if(solution_type==TransientSolutionEnum && analysis_type==PrognosticAnalysisEnum && isprognostic==false && isgroundingline==false) continue;
     57                if(solution_type==TransientSolutionEnum && analysis_type==DiagnosticHorizAnalysisEnum && isdiagnostic==false) continue;
     58                if(solution_type==TransientSolutionEnum && analysis_type==DiagnosticVertAnalysisEnum && isdiagnostic==false) continue;
     59                if(solution_type==TransientSolutionEnum && analysis_type==DiagnosticHutterAnalysisEnum && isdiagnostic==false) continue;
    5260       
    5361                _printf_(VerboseMProcessor(),"   create datasets for analysis %s\n",EnumToStringx(analysis_type));

  • issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp

    r10657 r11027  
    4141        iomodel->FetchDataToInput(elements,SurfaceEnum);
    4242        iomodel->FetchDataToInput(elements,BedEnum);
     43        iomodel->FetchDataToInput(elements,BathymetryEnum);
    4344        iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
    4445        iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);

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

    r10400 r11027  
    1717               
    1818#ifdef _SERIAL_
    19 void OutputResultsx(mxArray** pdataref, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results** presults, int step, double time){
     19void OutputResultsx(mxArray** pdataref, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results** presults){
    2020#else
    21 void OutputResultsx(                    Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results** presults, int step, double time){
     21void OutputResultsx(                    Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results** presults){
    2222#endif
    2323
    … …  
    5454        /*We have results inside our elements, loads, etc ... Get them out of there, into the results dataset: */
    5555        elements->ProcessResultsUnits();
    56         elements->ToResults(results,parameters,step,time);
     56        elements->ToResults(results,parameters);
    5757        elements->DeleteResults();
    5858

  • issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.h

    r9320 r11027  
    1616#ifdef _SERIAL_
    1717#include <mex.h>
    18 void OutputResultsx(mxArray** pdataref, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads,  Materials* materials, Parameters* parameters, Results** presults,int step=1,double time=0);
     18void OutputResultsx(mxArray** pdataref, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads,  Materials* materials, Parameters* parameters, Results** presults);
    1919#else
    20 void OutputResultsx(Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads,  Materials* materials, Parameters* parameters, Results** presults,int step=1,double time=0);
     20void OutputResultsx(Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads,  Materials* materials, Parameters* parameters, Results** presults);
    2121#endif
    2222

  • issm/trunk/src/c/objects/ElementResults/BoolElementResult.cpp

    r10298 r11027  
    185185/*}}}*/
    186186/*FUNCTION BoolElementResult::GetVectorFromResults{{{1*/
    187 void BoolElementResult::GetVectorFromResults(Vec vector,int* doflist,int numdofs){
     187void BoolElementResult::GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs){
    188188
    189         double *doublevalues=NULL;
     189        _error_("cannot return vector on vertices");
     190} /*}}}*/
     191/*FUNCTION BoolElementResult::GetElementVectorFromResults{{{1*/
     192void BoolElementResult::GetElementVectorFromResults(Vec vector,int dof){
    190193
    191         /*Cast value to double vector*/
    192         doublevalues=(double*)xmalloc(numdofs*sizeof(double));
    193         for(int i=0;i<numdofs;i++) doublevalues[i]=double(this->value);
    194 
    195         VecSetValues(vector,numdofs,doflist,(const double*)doublevalues,INSERT_VALUES);
    196 
    197         /*cleanup*/
    198         xfree((void**)&doublevalues);
     194        VecSetValue(vector,dof,(double)value,INSERT_VALUES);
    199195} /*}}}*/

  • issm/trunk/src/c/objects/ElementResults/BoolElementResult.h

    r9883 r11027  
    4545                /*ElementResult virtual functions definitions: {{{1*/
    4646                ElementResult* SpawnTriaElementResult(int* indices);
     47                double  GetTime(void){return time;};
     48                int     GetStep(void){return step;};
    4749                void    ProcessUnits(Parameters* parameters);
    4850                int     NumberOfNodalValues(void);
    … …  
    5153                /*BoolElementResult management: {{{1*/
    5254                int   InstanceEnum();
    53                 void GetVectorFromResults(Vec vector,int* doflist,int numdofs);
     55                void GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs);
     56                void GetElementVectorFromResults(Vec vector,int dof);
    5457                /*}}}*/
    5558};

  • issm/trunk/src/c/objects/ElementResults/DoubleElementResult.h

    r9883 r11027  
    4545                /*ElementResult virtual functions definitions: {{{1*/
    4646                ElementResult* SpawnTriaElementResult(int* indices);
     47                double  GetTime(void){return time;};
     48                int     GetStep(void){return step;};
    4749                void    ProcessUnits(Parameters* parameters);
    4850                int     NumberOfNodalValues(void);
    … …  
    5153                /*DoubleElementResult management: {{{1*/
    5254                int   InstanceEnum();
    53                 void GetVectorFromResults(Vec vector,int* doflist,int numdofs){_error_("not implemented");};
     55                void GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs){_error_("not implemented");};
     56                void GetElementVectorFromResults(Vec vector,int dof){_error_("not implemented");};
    5457                /*}}}*/
    5558};

  • issm/trunk/src/c/objects/ElementResults/ElementResult.h

    r9883 r11027  
    1919               
    2020                virtual         ElementResult* SpawnTriaElementResult(int* indices)=0;
     21                virtual double  GetTime(void)=0;
     22                virtual int     GetStep(void)=0;
    2123                virtual void    ProcessUnits(Parameters* parameters)=0;
    2224                virtual int     NumberOfNodalValues(void)=0;
    2325                virtual void    PatchFill(int row, Patch* patch)=0;
    2426                virtual int     InstanceEnum()=0;
    25                 virtual void    GetVectorFromResults(Vec vector,int* doflist,int numdof)=0;
     27                virtual void    GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdof)=0;
     28                virtual void    GetElementVectorFromResults(Vec vector,int dof)=0;
    2629
    2730};

  • issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.cpp

    r9883 r11027  
    195195/*}}}*/
    196196/*FUNCTION PentaVertexElementResult::GetVectorFromResults{{{1*/
    197 void PentaVertexElementResult::GetVectorFromResults(Vec vector,int* doflist,int numdofs){
     197void PentaVertexElementResult::GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs){
     198
     199        double data[6];
    198200
    199201        if(numdofs!=6)_error_("Result %s is a PentaVertexElementResult and cannot write vector of %i dofs",numdofs);
    200         VecSetValues(vector,numdofs,doflist,(const double*)this->values,INSERT_VALUES);
     202        for(int i=0;i<6;i++) data[i]=this->values[i]/(double)connectivitylist[i];
     203        VecSetValues(vector,numdofs,doflist,(const double*)&data,ADD_VALUES);
    201204
    202205} /*}}}*/
     206/*FUNCTION PentaVertexElementResult::GetElementVectorFromResults{{{1*/
     207void PentaVertexElementResult::GetElementVectorFromResults(Vec vector,int dof){
     208
     209        _error_("Result %s is a PentaVertexElementResult and should not write vector of size numberofelemenrs",EnumToStringx(enum_type));
     210} /*}}}*/

  • issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.h

    r9883 r11027  
    4444                /*ElementResult virtual functions definitions: {{{1*/
    4545                ElementResult* SpawnTriaElementResult(int* indices);
     46                double  GetTime(void){return time;};
     47                int     GetStep(void){return step;};
    4648                void    ProcessUnits(Parameters* parameters);
    4749                int     NumberOfNodalValues(void);
    … …  
    5052                /*PentaVertexElementResult management: {{{1*/
    5153                int   InstanceEnum();
    52                 void GetVectorFromResults(Vec vector,int* doflist,int numdofs);
     54                void GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs);
     55                void GetElementVectorFromResults(Vec vector,int dof);
    5356                /*}}}*/
    5457

  • issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.cpp

    r9883 r11027  
    184184/*}}}*/
    185185/*FUNCTION TriaVertexElementResult::GetVectorFromResults{{{1*/
    186 void TriaVertexElementResult::GetVectorFromResults(Vec vector,int* doflist,int numdofs){
     186void TriaVertexElementResult::GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs){
     187
     188        double data[3];
    187189
    188190        if(numdofs!=3)_error_("Result %s is a TriaVertexElementResult and cannot write vector of %i dofs",numdofs);
    189         VecSetValues(vector,numdofs,doflist,(const double*)this->values,INSERT_VALUES);
     191        for(int i=0;i<3;i++) data[i]=this->values[i]/(double)connectivitylist[i];
     192        VecSetValues(vector,numdofs,doflist,(const double*)&data,ADD_VALUES);
    190193
    191194} /*}}}*/
     195/*FUNCTION TriaVertexElementResult::GetElementVectorFromResults{{{1*/
     196void TriaVertexElementResult::GetElementVectorFromResults(Vec vector,int dof){
     197
     198        _error_("Result %s is a TriaVertexElementResult and should not write vector of size numberofelemenrs",EnumToStringx(enum_type));
     199} /*}}}*/

  • issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.h

    r9883 r11027  
    4343                /*ElementResult virtual functions definitions: {{{1*/
    4444                ElementResult* SpawnTriaElementResult(int* indices);
     45                double  GetTime(void){return time;};
     46                int     GetStep(void){return step;};
    4547                void    ProcessUnits(Parameters* parameters);
    4648                int     NumberOfNodalValues(void);
    … …  
    4951                /*TriaVertexElementResult management: {{{1*/
    5052                int   InstanceEnum();
    51                 void GetVectorFromResults(Vec vector,int* doflist,int numdofs);
     53                void GetVectorFromResults(Vec vector,int* doflist,int* connectivitylist,int numdofs);
     54                void GetElementVectorFromResults(Vec vector,int dof);
    5255                /*}}}*/
    5356

  • issm/trunk/src/c/objects/Elements/Element.h

    r10703 r11027  
    4747                virtual void   PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes)=0;
    4848                virtual void   PatchFill(int* pcount, Patch* patch)=0;
    49                 virtual void   ListResultsEnums(int** results_enums,int* num_results)=0;
     49                virtual void   ListResultsInfo(int** results_enums,int** results_size,double** results_times,int** results_steps,int* num_results)=0;
    5050                virtual void   DeleteResults(void)=0;
    5151                virtual void   Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type)=0;
    … …  
    5959                virtual void   InputScale(int enum_type,double scale_factor)=0;
    6060                virtual void   GetVectorFromInputs(Vec vector, int name_enum)=0;
    61                 virtual void   GetVectorFromResults(Vec vector,int name_enum)=0;
     61                virtual void   GetVectorFromResults(Vec vector,int id,int interp)=0;
    6262                virtual void   InputArtificialNoise(int enum_type,double min,double max)=0;
    6363                virtual bool   InputConvergence(double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums)=0;

  • issm/trunk/src/c/objects/Elements/Penta.cpp

    r10981 r11027  
    817817}
    818818/*}}}*/
     819/*FUNCTION Penta::GetConnectivityList {{{1*/
     820void  Penta::GetConnectivityList(int* connectivity){
     821        for(int i=0;i<NUMVERTICES;i++) connectivity[i]=nodes[i]->GetConnectivity();
     822}
     823/*}}}*/
    819824/*FUNCTION Penta::GetElementType {{{1*/
    820825int Penta::GetElementType(){
    … …  
    11391144/*}}}*/
    11401145/*FUNCTION Penta::GetVectorFromResults{{{1*/
    1141 void  Penta::GetVectorFromResults(Vec vector,int result_enum){
    1142 
    1143         int doflist1[NUMVERTICES];
    1144 
    1145         /*Prepare index list*/
    1146         this->GetSidList(&doflist1[0]);
    1147 
    1148         /*Get result)*/
    1149         for(int i=0;i<this->results->Size();i++){
    1150                 ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(i);
    1151                 if(elementresult->InstanceEnum()!=result_enum) continue;
    1152                 elementresult->GetVectorFromResults(vector,&doflist1[0],NUMVERTICES);
    1153                 return;
    1154         }
    1155 
    1156         _error_("Result %s not found in element",EnumToStringx(result_enum));
     1146void  Penta::GetVectorFromResults(Vec vector,int offset,int interp){
     1147
     1148        /*Get result*/
     1149        ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(offset);
     1150        if(interp==P1Enum){
     1151                int doflist1[NUMVERTICES];
     1152                int connectivity[NUMVERTICES];
     1153                this->GetSidList(&doflist1[0]);
     1154                this->GetConnectivityList(&connectivity[0]);
     1155                elementresult->GetVectorFromResults(vector,&doflist1[0],&connectivity[0],NUMVERTICES);
     1156        }
     1157        else if(interp==P0Enum){
     1158                elementresult->GetElementVectorFromResults(vector,sid);
     1159        }
     1160        else{
     1161                printf("Interpolation %s not supported\n",EnumToStringx(interp));
     1162        }
    11571163}
    11581164/*}}}*/
    … …  
    20572063}
    20582064/*}}}*/
    2059 /*FUNCTION Penta::ListResultsEnums{{{*/
    2060 void Penta::ListResultsEnums(int** in_results_enums,int* in_num_results){
     2065/*FUNCTION Penta::ListResultsInfo{{{*/
     2066void Penta::ListResultsInfo(int** in_resultsenums,int** in_resultssizes,double** in_resultstimes,int** in_resultssteps,int* in_num_results){
    20612067
    20622068        /*Intermediaries*/
    … …  
    20642070        int     numberofresults = 0;
    20652071        int     *resultsenums   = NULL;
     2072        int     *resultssizes   = NULL;
     2073        double  *resultstimes   = NULL;
     2074        int     *resultssteps   = NULL;
    20662075
    20672076        /*Checks*/
    … …  
    20782087                /*Allocate output*/
    20792088                resultsenums=(int*)xmalloc(numberofresults*sizeof(int));
     2089                resultssizes=(int*)xmalloc(numberofresults*sizeof(int));
     2090                resultstimes=(double*)xmalloc(numberofresults*sizeof(double));
     2091                resultssteps=(int*)xmalloc(numberofresults*sizeof(int));
    20802092
    20812093                /*populate enums*/
    … …  
    20832095                        ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(i);
    20842096                        resultsenums[i]=elementresult->InstanceEnum();
     2097                        resultstimes[i]=elementresult->GetTime();
     2098                        resultssteps[i]=elementresult->GetStep();
     2099                        if(elementresult->ObjectEnum()==PentaVertexElementResultEnum){
     2100                                resultssizes[i]=P1Enum;
     2101                        }
     2102                        else{
     2103                                resultssizes[i]=P0Enum;
     2104                        }
    20852105                }
    20862106        }
    … …  
    20882108        /*Assign output pointers:*/
    20892109        *in_num_results=numberofresults;
    2090         *in_results_enums=resultsenums;
     2110        *in_resultsenums=resultsenums;
     2111        *in_resultssizes=resultssizes;
     2112        *in_resultstimes=resultstimes;
     2113        *in_resultssteps=resultssteps;
    20912114
    20922115}/*}}}*/
    … …  
    26742697                        /*default vx,vy and vz: either observation or 0 */
    26752698                        if(!iomodel->Data(VxEnum)){
    2676                                 if (iomodel->Data(InversionVxObsEnum)) for(i=0;i<6;i++)nodeinputs[i]=iomodel->Data(InversionVxObsEnum)[penta_vertex_ids[i]-1]/yts;
    2677                                 else                 for(i=0;i<6;i++)nodeinputs[i]=0;
     2699                                for(i=0;i<6;i++)nodeinputs[i]=0;
    26782700                                this->inputs->AddInput(new PentaVertexInput(VxEnum,nodeinputs));
    2679                                 this->inputs->AddInput(new PentaVertexInput(VxPicardEnum,nodeinputs));
    26802701                                if(dakota_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVxEnum,nodeinputs));
    26812702                        }
    26822703                        if(!iomodel->Data(VyEnum)){
    2683                                 if (iomodel->Data(InversionVyObsEnum)) for(i=0;i<6;i++)nodeinputs[i]=iomodel->Data(InversionVyObsEnum)[penta_vertex_ids[i]-1]/yts;
    2684                                 else                 for(i=0;i<6;i++)nodeinputs[i]=0;
     2704                                for(i=0;i<6;i++)nodeinputs[i]=0;
    26852705                                this->inputs->AddInput(new PentaVertexInput(VyEnum,nodeinputs));
    2686                                 this->inputs->AddInput(new PentaVertexInput(VyPicardEnum,nodeinputs));
    26872706                                if(dakota_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVyEnum,nodeinputs));
    26882707                        }
    26892708                        if(!iomodel->Data(VzEnum)){
    2690                                 if (iomodel->Data(InversionVzObsEnum)) for(i=0;i<6;i++)nodeinputs[i]=iomodel->Data(InversionVzObsEnum)[penta_vertex_ids[i]-1]/yts;
    2691                                 else                 for(i=0;i<6;i++)nodeinputs[i]=0;
     2709                                for(i=0;i<6;i++)nodeinputs[i]=0;
    26922710                                this->inputs->AddInput(new PentaVertexInput(VzEnum,nodeinputs));
    2693                                 this->inputs->AddInput(new PentaVertexInput(VzPicardEnum,nodeinputs));
    26942711                                if(dakota_analysis) this->inputs->AddInput(new PentaVertexInput(QmuVzEnum,nodeinputs));
    26952712                        }

  • issm/trunk/src/c/objects/Elements/Penta.h

    r10703 r11027  
    9292                double GetZcoord(GaussPenta* gauss);
    9393                void   GetVectorFromInputs(Vec vector,int name_enum);
    94                 void   GetVectorFromResults(Vec vector,int name_enum);
     94                void   GetVectorFromResults(Vec vector,int offset,int interp);
    9595               
    9696                int    Sid();
    … …  
    107107                void   PotentialSheetUngrounding(Vec potential_sheet_ungrounding);
    108108                void   RequestedOutput(int output_enum,int step,double time);
    109                 void   ListResultsEnums(int** results_enums,int* num_results);
     109                void   ListResultsInfo(int** results_enums,int** results_size,double** results_times,int** results_steps,int* num_results);
    110110                void   PatchFill(int* pcount, Patch* patch);
    111111                void   PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes);
    … …  
    169169                void      GetDofList1(int* doflist);
    170170                void    GetSidList(int* sidlist);
     171                void    GetConnectivityList(int* connectivity);
    171172                int     GetElementType(void);
    172173                void    GetElementSizes(double* hx,double* hy,double* hz);

  • issm/trunk/src/c/objects/Elements/Tria.cpp

    r10981 r11027  
    11781178/*FUNCTION Tria::GetSidList {{{1*/
    11791179void  Tria::GetSidList(int* sidlist){
    1180 
    1181         int i;
    1182         for(i=0;i<NUMVERTICES;i++) sidlist[i]=nodes[i]->GetSidList();
    1183 
     1180        for(int i=0;i<NUMVERTICES;i++) sidlist[i]=nodes[i]->GetSidList();
     1181}
     1182/*}}}*/
     1183/*FUNCTION Tria::GetConnectivityList {{{1*/
     1184void  Tria::GetConnectivityList(int* connectivity){
     1185        for(int i=0;i<NUMVERTICES;i++) connectivity[i]=nodes[i]->GetConnectivity();
    11841186}
    11851187/*}}}*/
    … …  
    12401242
    12411243        /*Get out if this is not an element input*/
    1242         if (!IsInput(input_enum)) return;
     1244        if(!IsInput(input_enum)) return;
    12431245
    12441246        /*Prepare index list*/
    … …  
    12541256/*}}}*/
    12551257/*FUNCTION Tria::GetVectorFromResults{{{1*/
    1256 void  Tria::GetVectorFromResults(Vec vector,int result_enum){
    1257 
    1258         bool found=false;
    1259         int doflist1[NUMVERTICES];
    1260 
    1261         /*Prepare index list*/
    1262         this->GetSidList(&doflist1[0]);
    1263 
    1264         /*Get result)*/
    1265         for(int i=0;i<this->results->Size();i++){
    1266                 ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(i);
    1267                 if(elementresult->InstanceEnum()!=result_enum) continue;
    1268                 elementresult->GetVectorFromResults(vector,&doflist1[0],NUMVERTICES);
    1269                 return;
    1270         }
    1271 
    1272         _error_("Result %s not found in element",EnumToStringx(result_enum));
     1258void  Tria::GetVectorFromResults(Vec vector,int offset,int interp){
     1259
     1260        /*Get result*/
     1261        ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(offset);
     1262        if(interp==P1Enum){
     1263                int doflist1[NUMVERTICES];
     1264                int connectivity[NUMVERTICES];
     1265                this->GetSidList(&doflist1[0]);
     1266                this->GetConnectivityList(&connectivity[0]);
     1267                elementresult->GetVectorFromResults(vector,&doflist1[0],&connectivity[0],NUMVERTICES);
     1268        }
     1269        else if(interp==P0Enum){
     1270                elementresult->GetElementVectorFromResults(vector,sid);
     1271        }
     1272        else{
     1273                printf("Interpolation %s not supported\n",EnumToStringx(interp));
     1274        }
    12731275}
    12741276/*}}}*/
    … …  
    18971899}
    18981900/*}}}*/
    1899 /*FUNCTION Tria::ListResultsEnums{{{*/
    1900 void Tria::ListResultsEnums(int** in_results_enums,int* in_num_results){
     1901/*FUNCTION Tria::ListResultsInfo{{{*/
     1902void Tria::ListResultsInfo(int** in_resultsenums,int** in_resultssizes,double** in_resultstimes,int** in_resultssteps,int* in_num_results){
    19011903
    19021904        /*Intermediaries*/
    … …  
    19041906        int     numberofresults = 0;
    19051907        int     *resultsenums   = NULL;
     1908        int     *resultssizes   = NULL;
     1909        double  *resultstimes   = NULL;
     1910        int     *resultssteps   = NULL;
    19061911
    19071912        /*Checks*/
    … …  
    19181923                /*Allocate output*/
    19191924                resultsenums=(int*)xmalloc(numberofresults*sizeof(int));
     1925                resultssizes=(int*)xmalloc(numberofresults*sizeof(int));
     1926                resultstimes=(double*)xmalloc(numberofresults*sizeof(double));
     1927                resultssteps=(int*)xmalloc(numberofresults*sizeof(int));
    19201928
    19211929                /*populate enums*/
    … …  
    19231931                        ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(i);
    19241932                        resultsenums[i]=elementresult->InstanceEnum();
     1933                        resultstimes[i]=elementresult->GetTime();
     1934                        resultssteps[i]=elementresult->GetStep();
     1935                        if(elementresult->ObjectEnum()==TriaVertexElementResultEnum){
     1936                                resultssizes[i]=P1Enum;
     1937                        }
     1938                        else{
     1939                                resultssizes[i]=P0Enum;
     1940                        }
    19251941                }
    19261942        }
    … …  
    19281944        /*Assign output pointers:*/
    19291945        *in_num_results=numberofresults;
    1930         *in_results_enums=resultsenums;
     1946        *in_resultsenums=resultsenums;
     1947        *in_resultssizes=resultssizes;
     1948        *in_resultstimes=resultstimes;
     1949        *in_resultssteps=resultssteps;
    19311950
    19321951}/*}}}*/
    … …  
    23102329                        /*default vx,vy and vz: either observation or 0 */
    23112330                        if(!iomodel->Data(VxEnum)){
    2312                                 if (iomodel->Data(InversionVxObsEnum)) for(i=0;i<3;i++)nodeinputs[i]=iomodel->Data(InversionVxObsEnum)[tria_vertex_ids[i]-1]/yts;
    2313                                 else                 for(i=0;i<3;i++)nodeinputs[i]=0;
     2331                                for(i=0;i<3;i++)nodeinputs[i]=0;
    23142332                                this->inputs->AddInput(new TriaVertexInput(VxEnum,nodeinputs));
    2315                                 this->inputs->AddInput(new TriaVertexInput(VxPicardEnum,nodeinputs));
    23162333                                if(dakota_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVxEnum,nodeinputs));
    23172334                        }
    23182335                        if(!iomodel->Data(VyEnum)){
    2319                                 if (iomodel->Data(InversionVyObsEnum)) for(i=0;i<3;i++)nodeinputs[i]=iomodel->Data(InversionVyObsEnum)[tria_vertex_ids[i]-1]/yts;
    2320                                 else                 for(i=0;i<3;i++)nodeinputs[i]=0;
     2336                                for(i=0;i<3;i++)nodeinputs[i]=0;
    23212337                                this->inputs->AddInput(new TriaVertexInput(VyEnum,nodeinputs));
    2322                                 this->inputs->AddInput(new TriaVertexInput(VyPicardEnum,nodeinputs));
    23232338                                if(dakota_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVyEnum,nodeinputs));
    23242339                        }
    23252340                        if(!iomodel->Data(VzEnum)){
    2326                                 if (iomodel->Data(InversionVzObsEnum)) for(i=0;i<3;i++)nodeinputs[i]=iomodel->Data(InversionVzObsEnum)[tria_vertex_ids[i]-1]/yts;
    2327                                 else                 for(i=0;i<3;i++)nodeinputs[i]=0;
     2341                                for(i=0;i<3;i++)nodeinputs[i]=0;
    23282342                                this->inputs->AddInput(new TriaVertexInput(VzEnum,nodeinputs));
    2329                                 this->inputs->AddInput(new TriaVertexInput(VzPicardEnum,nodeinputs));
    23302343                                if(dakota_analysis) this->inputs->AddInput(new TriaVertexInput(QmuVzEnum,nodeinputs));
    23312344                        }

  • issm/trunk/src/c/objects/Elements/Tria.h

    r10703 r11027  
    9292                void   GetSolutionFromInputs(Vec solution);
    9393                void   GetVectorFromInputs(Vec vector, int name_enum);
    94                 void   GetVectorFromResults(Vec vector,int name_enum);
     94                void   GetVectorFromResults(Vec vector,int offset,int interp);
    9595                void   InputArtificialNoise(int enum_type,double min, double max);
    9696                bool   InputConvergence(double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums);
    … …  
    106106                void   PotentialSheetUngrounding(Vec potential_sheet_ungrounding);
    107107                void   RequestedOutput(int output_enum,int step,double time);
    108                 void   ListResultsEnums(int** results_enums,int* num_results);
     108                void   ListResultsInfo(int** results_enums,int** results_size,double** results_times,int** results_steps,int* num_results);
    109109                void   PatchFill(int* pcount, Patch* patch);
    110110                void   PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes);
    … …  
    183183                void             GetDofList1(int* doflist);
    184184                void           GetSidList(int* sidlist);
     185                void           GetConnectivityList(int* connectivity);
    185186                void           GetInputListOnVertices(double* pvalue,int enumtype);
    186187                void           GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue);

  • issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp

    r9883 r11027  
    209209void DoubleVecExternalResult::SetMatlabField(mxArray* dataref){
    210210
    211         mxArray* pfield=NULL;
    212         double* doublemat=NULL;
    213         char* name=NULL;
    214         double* doublevec=NULL;
     211        mxArray *pfield    = NULL;
     212        double  *doublemat = NULL;
     213        char    *name      = NULL;
     214        double  *doublevec = NULL;
    215215
    216216        /*Make a copy of the value, to be used by matlab: */
    … …  
    230230        mxSetField( dataref, this->step-1, "time",mxCreateDoubleScalar((double)this->time));
    231231        mxSetField( dataref, this->step-1, "step",mxCreateDoubleScalar((double)this->step));
    232 
    233232}
    234233#endif

  • issm/trunk/src/c/objects/Node.cpp

    r10576 r11027  
    6565        if (iomodel->Data(MaskVertexongroundediceEnum))
    6666         this->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,(IssmBool)iomodel->Data(MaskVertexongroundediceEnum)[io_index]));
    67         if (iomodel->numbernodetoelementconnectivity)
    68          this->inputs->AddInput(new IntInput(NumberNodeToElementConnectivityEnum,(IssmInt)iomodel->numbernodetoelementconnectivity[io_index]));
    6967        if (analysis_type==DiagnosticHorizAnalysisEnum)
    7068         this->inputs->AddInput(new IntInput(ApproximationEnum,(IssmInt)iomodel->Data(FlowequationVertexEquationEnum)[io_index]));
    … …  
    664662/*FUNCTION Node::GetConnectivity {{{1*/
    665663int Node::GetConnectivity(){
    666         int connectivity;
    667 
    668         /*recover parameters: */
    669         inputs->GetInputValue(&connectivity,NumberNodeToElementConnectivityEnum);
    670 
    671         return connectivity;
     664
     665        Vertex*  vertex=NULL;
     666        vertex=(Vertex*)hvertex->delivers();
     667        return vertex->connectivity;
    672668}
    673669/*}}}*/

  • issm/trunk/src/c/objects/Vertex.cpp

    r9883 r11027  
    2424/*}}}*/
    2525/*FUNCTION Vertex::Vertex(int vertex_id, double vertex_x, double vertex_y, double vertex_z, double vertex_sigma){{{1*/
    26 Vertex::Vertex(int vertex_id, int vertex_sid,double vertex_x, double vertex_y, double vertex_z, double vertex_sigma){
    27         this->Init(vertex_id, vertex_sid,vertex_x, vertex_y, vertex_z, vertex_sigma);
     26Vertex::Vertex(int vertex_id, int vertex_sid,double vertex_x, double vertex_y, double vertex_z, double vertex_sigma,int vertex_connectivity){
     27        this->Init(vertex_id, vertex_sid,vertex_x, vertex_y, vertex_z, vertex_sigma,vertex_connectivity);
    2828}
    2929/*}}}*/
    … …  
    3131Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel){
    3232
    33         this->Init(vertex_id, vertex_sid, iomodel->Data(MeshXEnum)[i],iomodel->Data(MeshYEnum)[i],iomodel->Data(MeshZEnum)[i],(iomodel->Data(MeshZEnum)[i]-iomodel->Data(BedEnum)[i])/(iomodel->Data(ThicknessEnum)[i]));
     33        _assert_(iomodel->Data(MeshXEnum) && iomodel->Data(MeshYEnum) && iomodel->Data(MeshZEnum));
     34        _assert_(iomodel->Data(BedEnum) && iomodel->Data(ThicknessEnum) && iomodel->numbernodetoelementconnectivity);
     35
     36        this->Init(vertex_id, vertex_sid, iomodel->Data(MeshXEnum)[i],iomodel->Data(MeshYEnum)[i],iomodel->Data(MeshZEnum)[i],(iomodel->Data(MeshZEnum)[i]-iomodel->Data(BedEnum)[i])/(iomodel->Data(ThicknessEnum)[i]),iomodel->numbernodetoelementconnectivity[i]);
    3437
    3538}
    … …  
    4144/*}}}*/
    4245/*FUNCTION Vertex::Init{{{1*/
    43 void Vertex::Init(int vertex_id, int vertex_sid,double vertex_x, double vertex_y, double vertex_z, double vertex_sigma){
     46void Vertex::Init(int vertex_id, int vertex_sid,double vertex_x, double vertex_y, double vertex_z, double vertex_sigma,int vertex_connectivity){
    4447
    4548        /*all the initialization has been done by the initializer, just fill in the id: */
    … …  
    5053        this->z=vertex_z;
    5154        this->sigma=vertex_sigma;
     55        this->connectivity=vertex_connectivity;
    5256        this->dof=UNDEF;
    5357
    … …  
    6771        printf("   z: %g\n",z);
    6872        printf("   sigma: %g\n",sigma);
     73        printf("   connectivity: %g\n",connectivity);
    6974        printf("   dof: %i\n",dof);
    7075        printf("   clone: %i\n",clone);
    … …  
    7479/*}}}*/
    7580/*FUNCTION Vertex::DeepEcho{{{1*/
    76 
    7781void Vertex::DeepEcho(void){
    7882        this->Echo();
    … …  
    111115        memcpy(marshalled_dataset,&z,sizeof(z));marshalled_dataset+=sizeof(z);
    112116        memcpy(marshalled_dataset,&sigma,sizeof(sigma));marshalled_dataset+=sizeof(sigma);
     117        memcpy(marshalled_dataset,&connectivity,sizeof(connectivity));marshalled_dataset+=sizeof(connectivity);
    113118        memcpy(marshalled_dataset,&dof,sizeof(dof));marshalled_dataset+=sizeof(dof);
    114119        memcpy(marshalled_dataset,&clone,sizeof(clone));marshalled_dataset+=sizeof(clone);
    … …  
    127132                sizeof(z)+
    128133                sizeof(sigma)+
     134                sizeof(connectivity)+
    129135                sizeof(dof)+
    130136                sizeof(clone)+
    … …  
    150156        memcpy(&z,marshalled_dataset,sizeof(z));marshalled_dataset+=sizeof(z);
    151157        memcpy(&sigma,marshalled_dataset,sizeof(sigma));marshalled_dataset+=sizeof(sigma);
     158        memcpy(&connectivity,marshalled_dataset,sizeof(connectivity));marshalled_dataset+=sizeof(connectivity);
    152159        memcpy(&dof,marshalled_dataset,sizeof(dof));marshalled_dataset+=sizeof(dof);
    153160        memcpy(&clone,marshalled_dataset,sizeof(clone));marshalled_dataset+=sizeof(clone);
    … …  
    259266
    260267/*Vertex management: */
     268/*FUNCTION Vertex::Connectivity{{{1*/
     269int    Vertex::Connectivity(void){return connectivity;}
     270/*}}}*/
    261271/*FUNCTION Vertex::Sid{{{1*/
    262272int    Vertex::Sid(void){ return sid; }

  • issm/trunk/src/c/objects/Vertex.h

    r9883 r11027  
    2121        public:
    2222
    23                 int  id;
    24                 int  sid; //sid for "serial" id, ie the rank of this vertex in the vertices dataset, if the dataset was serial on 1 cpu.
     23                int    id;
     24                int    sid;            //sid for "serial" id, ie the rank of this vertex in the vertices dataset, if the dataset was serial on 1 cpu.
    2525                double x;
    2626                double y;
    2727                double z;
    28                 double sigma; //sigma coordinate: (z-bed)/thickness
     28                double sigma;          //sigma coordinate: (z-bed)/thickness
     29                int    connectivity;   //number of vertices connected to this vertex
    2930
    3031                /*dof management: */
    … …  
    3435                /*Vertex constructors, destructors {{{1*/
    3536                Vertex();
    36                 Vertex(int id, int sid,double x, double y, double z, double sigma);
    37                 void Init(int id, int sid, double x, double y, double z, double sigma);
     37                Vertex(int id, int sid,double x, double y, double z, double sigma, int connectivity);
     38                void Init(int id, int sid, double x, double y, double z, double sigma,int connectivity);
    3839                Vertex(int id, int sid, int i, IoModel* iomodel);
    3940                ~Vertex();
    … …  
    6162                /*Vertex management: {{{1*/
    6263                int   Sid(void);
     64                int   Connectivity(void);
    6365                void  UpdatePosition(double* thickness,double* bed);
    6466                /*}}}*/

  • issm/trunk/src/c/solutions/hydrology_core.cpp

    r10534 r11027  
    6161                        /*unload results*/
    6262                        _printf_(VerboseSolution(),"   saving temporary results\n");
    63                         OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,&femmodel->results,i+1,time);
     63                        OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,&femmodel->results);
    6464
    6565                }

  • issm/trunk/src/c/solutions/transient_core.cpp

    r10650 r11027  
    133133                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceEnum,step,time);
    134134                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedEnum,step,time);
    135                         if(dim==3) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,step,time);
     135                        if(dim==3 && isthermal) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,step,time);
    136136                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalforcingsMeltingRateEnum,step,time);
    137137                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceforcingsMassBalanceEnum,step,time);
    … …  
    141141                        /*unload results*/
    142142                        _printf_(VerboseSolution(),"   saving temporary results\n");
    143                         OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,&femmodel->results,step,time);
     143                        OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,&femmodel->results);
    144144                }
    145145        }

  • issm/trunk/src/c/solvers/solver_stokescoupling_nonlinear.cpp

    r9761 r11027  
    5454                //Update once again the solution to make sure that vx and vxold are similar (for next step in transient or steadystate)
    5555                InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug_horiz);
     56                VecFree(&ug_horiz);
    5657
    5758                //save pointer to old velocity

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

    r10981 r11027  
    3131                function checkconsistency(obj,md,solution,analyses) % {{{
    3232
    33                         if ismember(PrognosticAnalysisEnum,analyses),
     33                        if ismember(PrognosticAnalysisEnum,analyses) & ~(solution==TransientSolutionEnum & md.transient.isprognostic==0),
    3434                                checkfield(md,'basalforcings.melting_rate','NaN',1,'forcing',1);
    3535                        end
    … …  
    3737                                checkfield(md,'basalforcings.melting_rate','NaN',1,'size',[md.mesh.numberofvertices 1]);
    3838                        end
    39                         if ismember(ThermalAnalysisEnum,analyses),
     39                        if ismember(ThermalAnalysisEnum,analyses) & ~(solution==TransientSolutionEnum & md.transient.isthermal==0),
    4040                                checkfield(md,'basalforcings.melting_rate','NaN',1,'forcing',1);
    4141                                checkfield(md,'basalforcings.geothermalflux','NaN',1,'forcing',1,'>=',0);

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

    r10981 r11027  
    7474                        %Early return
    7575                        if ~ismember(DiagnosticHorizAnalysisEnum,analyses), return; end
     76                        %if ~ismember(DiagnosticHorizAnalysisEnum,analyses) |  (solution==TransientSolutionEnum & md.transient.isdiagnostic==0), return; end
    7677
    7778                        checkfield(md,'diagnostic.spcvx','forcing',1);

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

    r10981 r11027  
    113113                function disp(obj) % {{{
    114114                        fielddisplay(obj,'iscontrol','is inversion activated?');
    115                         fielddisplay(obj,'control_parameters','parameter where inverse control is carried out; ex: {''FrictionCoefficient''}, or {''RheologyBbar''}');
     115                        fielddisplay(obj,'control_parameters','parameter where inverse control is carried out; ex: {''FrictionCoefficient''}, or {''MaterialsRheologyBbar''}');
     116                        fielddisplay(obj,'nsteps','number of optimization searches');
     117                        fielddisplay(obj,'cost_functions','indicate the type of response for each optimization steps');
    116118                        fielddisplay(obj,'cost_functions_coefficients','cost_functions_coefficients applied to the misfit of each vertex and for each control_parameter');
    117                         fielddisplay(obj,'nsteps','number of optimization searches');
     119                        fielddisplay(obj,'cost_function_threshold','misfit convergence criterion. Default is 1%, NaN if not applied');
    118120                        fielddisplay(obj,'maxiter_per_step','maximum iterations during each optimization step');
    119                         fielddisplay(obj,'cost_functions','indicate the type of response for each optimization steps');
    120                         fielddisplay(obj,'cost_function_threshold','misfit convergence criterion. Default is 1%, NaN if not applied');
    121121                        fielddisplay(obj,'gradient_scaling','scaling factor on gradient direction during optimization, for each optimization step');
    122122                        fielddisplay(obj,'step_threshold','decrease threshold for misfit, default is 30%');

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

    r10981 r11027  
    4242
    4343                        %Early return,
    44                         if ~ismember(PrognosticAnalysisEnum,analyses), return; end
     44                        if ~ismember(PrognosticAnalysisEnum,analyses) |  (solution==TransientSolutionEnum & md.transient.isprognostic==0), return; end
    4545
    4646                        checkfield(md,'prognostic.spcthickness','forcing',1);

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

    r10981 r11027  
    5555                        disp(sprintf('   rifts parameters:'));
    5656
    57                         fielddisplay(obj,'numrifts','number of of rifts');
    5857                        fielddisplay(obj,'riftstruct','structure containing all rift information (vertices coordinates, segments, type of melange, ...)');
    5958                        fielddisplay(obj,'riftproperties','');

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

    r10981 r11027  
    4646
    4747                        %Early return
    48                         if ~ismember(ThermalAnalysisEnum,analyses), return; end
     48                        if ~ismember(ThermalAnalysisEnum,analyses) | (solution==TransientSolutionEnum & md.transient.isthermal==0), return; end
    4949
    5050                        checkfield(md,'thermal.stabilization','numel',1,'values',[0 1 2]);

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

    r9734 r11027  
    99%
    1010%   Usage:
    11 %      md=setmesh(md,domainname)
    12 %   or md=setmesh(md,domainname,riftname);
     11%      md=meshnodensity(md,domainname)
     12%   or md=meshnodensity(md,domainname,riftname);
    1313%
    1414%   Examples:
    15 %      md=setmesh(md,'DomainOutline.exp');
    16 %      md=setmesh(md,'DomainOutline.exp','Rifts.exp');
     15%      md=meshnodensity(md,'DomainOutline.exp');
     16%      md=meshnodensity(md,'DomainOutline.exp','Rifts.exp');
    1717
    1818if (nargin==2),

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

    r9734 r11027  
    2626%Call MEX file
    2727[md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers,md.rifts.riftstruct]=TriMeshProcessRifts(md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers);
    28 md.rifts
    29 md.rifts.riftstruct
    3028if ~isstruct(md.rifts.riftstruct),
    3129        error('TriMeshProcessRifts did not find any rift');
    … …  
    3331
    3432%Fill in rest of fields:
     33numrifts=length(md.rifts.riftstruct);
    3534md.mesh.numberofelements=length(md.mesh.elements);
    3635md.mesh.numberofvertices=length(md.mesh.x);
    3736md.mesh.z=zeros(md.mesh.numberofvertices,1);
    3837md.mesh.vertexonboundary=zeros(length(md.mesh.x),1); md.mesh.vertexonboundary(md.mesh.segments(:,1:2))=1;
    39 md.rifts.numrifts=length(md.rifts.riftstruct);
    40 md.flowequation.element_equation=3*ones(md.mesh.numberofelements,1);
    4138md.mesh.vertexonbed=ones(md.mesh.numberofvertices,1);
    4239md.mesh.vertexonsurface=ones(md.mesh.numberofvertices,1);
    … …  
    4542
    4643%get coordinates of rift tips
    47 for i=1:md.rifts.numrifts,
     44for i=1:numrifts,
    4845        md.rifts.riftstruct(i).tip1coordinates=[md.mesh.x(md.rifts.riftstruct(i).tips(1)) md.mesh.y(md.rifts.riftstruct(i).tips(1))];
    4946        md.rifts.riftstruct(i).tip2coordinates=[md.mesh.x(md.rifts.riftstruct(i).tips(2)) md.mesh.y(md.rifts.riftstruct(i).tips(2))];
    … …  
    5350flags=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,domainoutline,'node',0);
    5451found=0;
    55 for i=1:md.rifts.numrifts,
     52for i=1:numrifts,
    5653        if flags(md.rifts.riftstruct(i).tips(1))==0,
    5754                found=1;

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

    r9827 r11027  
    1313%go through the file, and recover the line we want
    1414fid=fopen(configfile,'r');
    15 while(1),
     15if(fid==-1), error(['could not open file: ' configfile]); end
     16
     17while(true),
    1618        tline=fgets(fid);
    1719        if ~ischar(tline), break, end

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

    r10781 r11027  
    6666if exist(options,'edgecolor'),
    6767        A=elements(:,1); B=elements(:,2); C=elements(:,3);
    68         patch('Faces',[A B C],'Vertices', [x y z],'FaceVertexCData',zeros(size(x)),'FaceColor','none','EdgeColor',getfieldvalue(options,'edgecolor'));
     68        patch('Faces',[A B C],'Vertices', [x y z],'FaceVertexCData',data_grid(1)*ones(size(x)),'FaceColor','none','EdgeColor',getfieldvalue(options,'edgecolor'));
    6969end
    7070

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

    r10751 r11027  
    2525%Get number of curves and generate random colors
    2626numcurves=size(data,2);
    27 colorm=getfieldvalue(options,'colormap','line');
     27colorm=getfieldvalue(options,'colormap','lines');
    2828color=eval([ colorm '(numcurves);']);
    2929options=removefield(options,'colormap',0); %back to default colormap
    … …  
    6868                end
    6969
    70                 %plot section value
    71                 hold on;
    72                 subplot(nlines,ncols,index1)
    73                 %subplot(1,3,[2 3])
    74                 plot(s,data_s,'color',color(i,:),'LineWidth',getfieldvalue(options,'linewidth',1))
    75                 %3D
    76         else
    77                 %plot section value
    78                 %if user requested view2: 2d plot with curvilinear coordinate
    79                 if (getfieldvalue(options,'view',3)==2 )
     70                %2D
     71                if is2d,
     72%               %plot section value
     73%               hold on;
     74%               subplot(nlines,ncols,index1)
     75%               %subplot(1,3,[2 3])
     76%               plot(s,data_s,'color',color(i,:),'LineWidth',getfieldvalue(options,'linewidth',1))
     77%               %3D
     78%       else
     79%               %plot section value
     80%               %if user requested view2: 2d plot with curvilinear coordinate
     81%               if (getfieldvalue(options,'view',3)==2 )
    8082
    8183                        %Show Section if requested by user

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

    r9733 r11027  
    6767end
    6868
    69 %add in model who is who
    70 md.flowequation.element_equation=zeros(md.mesh.numberofelements,1);
    71 
    72 %1: Hutter elements
     69%Initialize node fields
    7370nodeonhutter=zeros(md.mesh.numberofvertices,1);
    7471nodeonhutter(md.mesh.elements(find(hutterflag),:))=1;
    75 md.flowequation.element_equation(find(hutterflag))=1;
    76 
    77 %2: MacAyeal elements
    7872nodeonmacayeal=zeros(md.mesh.numberofvertices,1);
    7973nodeonmacayeal(md.mesh.elements(find(macayealflag),:))=1;
    80 md.flowequation.bordermacayeal=nodeonmacayeal;
    81 md.flowequation.element_equation(find(macayealflag))=2;
    82 
    83 %3: Pattyn elements
    8474nodeonpattyn=zeros(md.mesh.numberofvertices,1);
    8575nodeonpattyn(md.mesh.elements(find(pattynflag),:))=1;
    86 md.flowequation.borderpattyn=nodeonpattyn;
    87 md.flowequation.element_equation(find(pattynflag))=3;
    88 
    89 %4: Stokes elements
     76nodeonstokes=zeros(md.mesh.numberofvertices,1);
     77noneflag=zeros(md.mesh.numberofelements,1);
     78
    9079%First modify stokesflag to get rid of elements contrained everywhere (spc + border with pattyn or macayeal)
    9180if any(stokesflag),
    92         nodeonstokes=zeros(md.mesh.numberofvertices,1);
    93         nodeonstokes(md.mesh.elements(find(stokesflag),:))=1;
    9481        fullspcnodes=double((~isnan(md.diagnostic.spcvx)+~isnan(md.diagnostic.spcvy)+~isnan(md.diagnostic.spcvz))==3 | (nodeonpattyn & nodeonstokes));         %find all the nodes on the boundary of the domain without icefront
    9582        fullspcelems=double(sum(fullspcnodes(md.mesh.elements),2)==6);         %find all the nodes on the boundary of the domain without icefront
    9683        stokesflag(find(fullspcelems))=0;
    97 end
    98 nodeonstokes=zeros(md.mesh.numberofvertices,1);
    99 nodeonstokes(md.mesh.elements(find(stokesflag),:))=1;
    100 md.flowequation.borderstokes=nodeonstokes;
    101 md.flowequation.element_equation(find(stokesflag))=4;
     84        nodeonstokes(md.mesh.elements(find(stokesflag),:))=1;
     85end
    10286
    10387%Then complete with NoneApproximation or the other model used if there is no stokes
    … …  
    10690                pattynflag(~stokesflag)=1;
    10791                nodeonpattyn(md.mesh.elements(find(pattynflag),:))=1;
    108                 md.flowequation.borderpattyn=nodeonpattyn;
    109                 md.flowequation.element_equation(find(~stokesflag))=3;
    11092        elseif any(macayealflag), %fill with macayeal
    11193                macayealflag(~stokesflag)=1;
    11294                nodeonmacayeal(md.mesh.elements(find(macayealflag),:))=1;
    113                 md.flowequation.bordermacayeal=nodeonmacayeal;
    114                 md.flowequation.element_equation(find(~stokesflag))=2;
    11595        else %fill with none
    116         %5: None elements (non Stokes)
    117                 md.flowequation.element_equation(find(~stokesflag))=0;
     96                noneflag(find(~stokesflag))=1;
    11897        end
    11998end
    … …  
    124103nodeonpattynstokes=zeros(md.mesh.numberofvertices,1);
    125104nodeonmacayealstokes=zeros(md.mesh.numberofvertices,1);
     105macayealpattynflag=zeros(md.mesh.numberofelements,1);
     106macayealstokesflag=zeros(md.mesh.numberofelements,1);
     107pattynstokesflag=zeros(md.mesh.numberofelements,1);
    126108if strcmpi(coupling_method,'penalties'),
    127109        %Create the border nodes between Pattyn and MacAyeal and extrude them
    … …  
    147129                commonelements(find(pattynflag))=0; %only one layer: the elements previously in macayeal
    148130                macayealflag(find(commonelements))=0; %these elements are now macayealpattynelements
    149                 macayealpattynflag=zeros(md.mesh.numberofelements,1);
    150131                macayealpattynflag(find(commonelements))=1;
    151                 nodeonmacayeal=zeros(md.mesh.numberofvertices,1);
    152                 nodeonmacayeal(md.mesh.elements(find(macayealflag),:))=1;
    153                 md.flowequation.bordermacayeal=nodeonmacayeal;
    154 
    155                 %Create MacaAyealPattynApproximation where needed
    156                 md.flowequation.element_equation(find(macayealpattynflag))=5;
    157 
    158                 %Now recreate nodeonmacayeal and nodeonmacayealpattyn
     132                nodeonmacayeal(:)=0;
     133                nodeonmacayeal(md.mesh.elements(find(macayealflag),:))=1;
     134
     135                %rule out elements that don't touch the 2 boundaries
     136                pos=find(macayealpattynflag);
     137                list=zeros(length(pos),1);
     138                list = list + any(sum(nodeonmacayeal(md.mesh.elements(pos,:)),2),2);
     139                list = list - any(sum(nodeonpattyn(md.mesh.elements(pos,:))  ,2),2);
     140                pos1=find(list==1);
     141                macayealflag(pos(pos1))=1;
     142                macayealpattynflag(pos(pos1))=0;
     143                pos2=find(list==-1);
     144                pattynflag(pos(pos2))=1;
     145                macayealpattynflag(pos(pos2))=0;
     146
     147                %Recompute nodes associated to these elements
     148                nodeonmacayeal(:)=0;
     149                nodeonmacayeal(md.mesh.elements(find(macayealflag),:))=1;
     150                nodeonpattyn(:)=0;
     151                nodeonpattyn(md.mesh.elements(find(pattynflag),:))=1;
     152                nodeonmacayealpattyn(:)=0;
    159153                nodeonmacayealpattyn(md.mesh.elements(find(macayealpattynflag),:))=1;
     154
    160155        elseif any(pattynflag) & any(stokesflag), %coupling pattyn stokes
    161156                %Find node at the border
    … …  
    166161                commonelements(find(pattynflag))=0; %only one layer: the elements previously in macayeal
    167162                stokesflag(find(commonelements))=0; %these elements are now macayealpattynelements
    168                 pattynstokesflag=zeros(md.mesh.numberofelements,1);
    169163                pattynstokesflag(find(commonelements))=1;
    170164                nodeonstokes=zeros(md.mesh.numberofvertices,1);
    171165                nodeonstokes(md.mesh.elements(find(stokesflag),:))=1;
    172                 md.flowequation.borderstokes=nodeonstokes;
    173 
    174                 %Create MacaAyealPattynApproximation where needed
    175                 md.flowequation.element_equation(find(pattynstokesflag))=7;
    176 
    177                 %Now recreate nodeonpattynstokes
    178                 nodeonpattynstokes=zeros(md.mesh.numberofvertices,1);
     166
     167                %rule out elements that don't touch the 2 boundaries
     168                pos=find(pattynstokesflag);
     169                list=zeros(length(pos),1);
     170                list = list + any(sum(nodeonstokes(md.mesh.elements(pos,:)),2),2);
     171                list = list - any(sum(nodeonpattyn(md.mesh.elements(pos,:)),2),2);
     172                pos1=find(list==1);
     173                stokesflag(pos(pos1))=1;
     174                pattynstokesflag(pos(pos1))=0;
     175                pos2=find(list==-1);
     176                pattynflag(pos(pos2))=1;
     177                pattynstokesflag(pos(pos2))=0;
     178
     179                %Recompute nodes associated to these elements
     180                nodeonstokes(:)=0;
     181                nodeonstokes(md.mesh.elements(find(stokesflag),:))=1;
     182                nodeonpattyn(:)=0;
     183                nodeonpattyn(md.mesh.elements(find(pattynflag),:))=1;
     184                nodeonpattynstokes(:)=0;
    179185                nodeonpattynstokes(md.mesh.elements(find(pattynstokesflag),:))=1;
     186
    180187        elseif any(stokesflag) & any(macayealflag),
    181188                %Find node at the border
    … …  
    186193                commonelements(find(macayealflag))=0; %only one layer: the elements previously in macayeal
    187194                stokesflag(find(commonelements))=0; %these elements are now macayealmacayealelements
    188                 macayealstokesflag=zeros(md.mesh.numberofelements,1);
    189195                macayealstokesflag(find(commonelements))=1;
    190196                nodeonstokes=zeros(md.mesh.numberofvertices,1);
    191197                nodeonstokes(md.mesh.elements(find(stokesflag),:))=1;
    192                 md.flowequation.borderstokes=nodeonstokes;
    193 
    194                 %Create MacaAyeal Approximation where needed
    195                 md.flowequation.element_equation(find(macayealstokesflag))=6;
    196 
    197                 %Now recreate nodeonmacayealstokes
    198                 nodeonmacayealstokes=zeros(md.mesh.numberofvertices,1);
     198
     199                %rule out elements that don't touch the 2 boundaries
     200                pos=find(macayealstokesflag);
     201                list=zeros(length(pos),1);
     202                list = list + any(sum(nodeonmacayeal(md.mesh.elements(pos,:)),2),2);
     203                list = list - any(sum(nodeonstokes(md.mesh.elements(pos,:))  ,2),2);
     204                pos1=find(list==1);
     205                macayealflag(pos(pos1))=1;
     206                macayealstokesflag(pos(pos1))=0;
     207                pos2=find(list==-1);
     208                stokesflag(pos(pos2))=1;
     209                macayealstokesflag(pos(pos2))=0;
     210
     211                %Recompute nodes associated to these elements
     212                nodeonmacayeal(:)=0;
     213                nodeonmacayeal(md.mesh.elements(find(macayealflag),:))=1;
     214                nodeonstokes(:)=0;
     215                nodeonstokes(md.mesh.elements(find(stokesflag),:))=1;
     216                nodeonmacayealstokes(:)=0;
    199217                nodeonmacayealstokes(md.mesh.elements(find(macayealstokesflag),:))=1;
     218
    200219        elseif any(stokesflag) & any(hutterflag),
    201220                error('type of coupling not supported yet');
    202221        end
    203222end
     223
     224%Create MacaAyealPattynApproximation where needed
     225md.flowequation.element_equation=zeros(md.mesh.numberofelements,1);
     226md.flowequation.element_equation(find(noneflag))=0;
     227md.flowequation.element_equation(find(hutterflag))=1;
     228md.flowequation.element_equation(find(macayealflag))=2;
     229md.flowequation.element_equation(find(pattynflag))=3;
     230md.flowequation.element_equation(find(stokesflag))=4;
     231md.flowequation.element_equation(find(macayealpattynflag))=5;
     232md.flowequation.element_equation(find(macayealstokesflag))=6;
     233md.flowequation.element_equation(find(pattynstokesflag))=7;
     234
     235%border
     236md.flowequation.borderpattyn=nodeonpattyn;
     237md.flowequation.bordermacayeal=nodeonmacayeal;
     238md.flowequation.borderstokes=nodeonstokes;
    204239
    205240%Create vertices_type
    … …  
    213248pos=find(nodeonhutter);
    214249md.flowequation.vertex_equation(pos)=1;
    215 pos=find(nodeonpattyn & nodeonmacayeal);
    216 md.flowequation.vertex_equation(pos)=3;
    217250pos=find(nodeonmacayealpattyn);
    218251md.flowequation.vertex_equation(pos)=5;
    … …  
    235268md.flowequation.isstokes=double(any(md.flowequation.element_equation==4));
    236269
    237 end
     270return
     271
     272%Check that tiling can work:
     273if any(md.flowequation.bordermacayeal) & any(md.flowequation.borderpattyn) & any(md.flowequation.borderpattyn + md.flowequation.bordermacayeal ~=1),
     274        error('error coupling domain too irregular');
     275end
     276if any(md.flowequation.bordermacayeal) & any(md.flowequation.borderstokes) & any(md.flowequation.borderstokes + md.flowequation.bordermacayeal ~=1),
     277        error('error coupling domain too irregular');
     278end
     279if any(md.flowequation.borderstokes) & any(md.flowequation.borderpattyn) & any(md.flowequation.borderpattyn + md.flowequation.borderstokes~=1),
     280        error('error coupling domain too irregular');
     281end

  • issm/trunk/src/m/solutions/transient_core.m

    r10649 r11027  
    8989                        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,SurfaceEnum,step,time);
    9090                        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,BedEnum,step,time);
    91                         if (dim==3), femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,TemperatureEnum,step,time);end
     91                        if (dim==3 & isthermal), femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,TemperatureEnum,step,time);end
    9292                        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,BasalforcingsMeltingRateEnum,step,time);
    9393                        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,SurfaceforcingsMassBalanceEnum,step,time);

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

    r9734 r11027  
    2323
    2424%Call Bamg
    25 md=setmesh(md,'RoundDomainOutline.exp',resolution);
     25md=triangle(md,'RoundDomainOutline.exp',resolution);
    2626%md=bamg(md,'domain','RoundDomainOutline.exp','hmin',resolution);
    2727

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

    r10656 r11027  
    110110        case 265, name='SquareShelfTranP3dForcTempSerial';
    111111        case 266, name='SquareShelfTranP3dForcTempParallel';
     112        case 267, name='SquareShelfTranForceNeg2dDakotaSamp';
     113   case 268, name='SquareShelfTranForceNeg2dDakotaLocal';
    112114        case 301, name='SquareSheetConstrainedDiagM2dSerial';
    113115        case 302, name='SquareSheetConstrainedDiagM2dParallel';

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

    r10658 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r8854 r11027  
    151151                                        %compare to archive
    152152                                        eval(['archive=' archive_name '_field' num2str(k) ';']);
    153                                         error_diff=full(max(abs(archive-field))/(max(abs(archive))+eps));
     153                                        error_diff=full(max(abs(archive(:)-field(:)))/(max(abs(archive))+eps));
    154154
    155155                                        %disp test result

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=meshconvert(md);
    33md=setmask(md,'all','');

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

    r10981 r11027  
    99        md=model;
    1010        md=squaremesh(md,L,L,nx,ny);
    11         %md=setmesh(md,'../Exp/SquareISMIP.exp',5500);
     11        %md=triangle(md,'../Exp/SquareISMIP.exp',5500);
    1212        md=setmask(md,'',''); %ice sheet test
    1313        md=parameterize(md,'../Par/ISMIPF.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=meshconvert(md);
    33md=setmask(md,'all','');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    44%tests 3 and 4: using Glen's flow law
    55md=model;
    6 md=setmesh(md,'../Exp/SquareEISMINT.exp',3550);
     6md=triangle(md,'../Exp/SquareEISMINT.exp',3550);
    77md=setmask(md,'all','');
    88md=parameterize(md,'../Par/SquareEISMINT.par');

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

    r10981 r11027  
    44%test 5 and 6 :
    55md=model;
    6 md=setmesh(md,'../Exp/SquareEISMINT.exp',5100); %test3
     6md=triangle(md,'../Exp/SquareEISMINT.exp',5100); %test3
    77md=setmask(md,'all','');
    88md=parameterize(md,'../Par/SquareEISMINT.par');

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

    r10981 r11027  
    44%tests 3 and 4: using Glen's flow law
    55md=model;
    6 md=setmesh(md,'../Exp/SquareEISMINT.exp',3550);
     6md=triangle(md,'../Exp/SquareEISMINT.exp',3550);
    77md=setmask(md,'all','');
    88md=parameterize(md,'../Par/SquareEISMINT.par');

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

    r10981 r11027  
    44
    55%To begin with the numerical model
    6 md=setmesh(model,'../Exp/SquareEISMINT750000.exp',resolution);
     6md=triangle(model,'../Exp/SquareEISMINT750000.exp',resolution);
    77md=setmask(md,'','');
    88md=parameterize(md,'../Par/RoundSheetEISMINT.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r9729 r11027  
    66
    77md=model;
    8 md=setmesh(md,'../Exp/Square.exp',100000);
     8md=triangle(md,'../Exp/Square.exp',100000);
    99md=setmask(md,'','');
    1010md=parameterize(md,'../Par/SquareThermal.par');
    … …  
    2929
    3030%plot results
    31 comp_melting=zeros(md.mesh.numberofvertices,1);
    32 comp_melting(md.results.ThermalSolution.BasalforcingsMeltingRate.index)=md.results.ThermalSolution.BasalforcingsMeltingRate.value;
     31comp_melting=md.results.ThermalSolution.BasalforcingsMeltingRate;
    3332relative=abs((comp_melting-melting)./melting)*100;
    3433relative(find(comp_melting==melting))=0;

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

    r9850 r11027  
    55
    66md=model;
    7 md=setmesh(md,'../Exp/Square.exp',100000);
     7md=triangle(md,'../Exp/Square.exp',100000);
    88md=setmask(md,'','');
    99md=parameterize(md,'../Par/SquareThermal.par');
    … …  
    3030
    3131%plot results
    32 comp_temp=zeros(md.mesh.numberofvertices,1);
    33 comp_temp(md.results.ThermalSolution.Temperature.index)=md.results.ThermalSolution.Temperature.value;
     32comp_temp=md.results.ThermalSolution.Temperature;
    3433relative=abs((comp_temp-md.initialization.temperature)./md.initialization.temperature)*100;
    3534relative(find(comp_temp==md.initialization.temperature))=0;

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

    r9850 r11027  
    66
    77md=model;
    8 md=setmesh(md,'../Exp/Square.exp',100000);
     8md=triangle(md,'../Exp/Square.exp',100000);
    99md=setmask(md,'all','');
    1010md=parameterize(md,'../Par/SquareThermal.par');
    … …  
    2525
    2626%plot results
    27 comp_temp=zeros(md.mesh.numberofvertices,1);
    28 comp_temp(md.results.ThermalSolution.Temperature.index)=md.results.ThermalSolution.Temperature.value;
     27comp_temp=md.results.ThermalSolution.Temperature;
    2928relative=abs((comp_temp-md.initialization.temperature)./md.initialization.temperature)*100;
    3029relative(find(comp_temp==md.initialization.temperature))=0;

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

    r9850 r11027  
    66
    77md=model;
    8 md=setmesh(md,'../Exp/Square.exp',100000);
     8md=triangle(md,'../Exp/Square.exp',100000);
    99md=setmask(md,'','');
    1010md=parameterize(md,'../Par/SquareThermal.par');
    … …  
    2626
    2727%plot results
    28 comp_temp=zeros(md.mesh.numberofvertices,1);
    29 comp_temp(md.results.ThermalSolution.Temperature.index)=md.results.ThermalSolution.Temperature.value;
     28comp_temp=md.results.ThermalSolution.Temperature;
    3029relative=abs((comp_temp-md.initialization.temperature)./md.initialization.temperature)*100;
    3130relative(find(comp_temp==md.initialization.temperature))=0;

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=meshconvert(md);
    33md=setmask(md,'all','');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=meshconvert(md);
    33md=setmask(md,'all','');

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

    r10981 r11027  
    11printingflag = false;
    22
    3 md=setmesh(model,'../Exp/Square.exp',350000);
     3md=triangle(model,'../Exp/Square.exp',350000);
    44md=setmask(md,'all','');
    55md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    11printingflag = false;
    22
    3 md=setmesh(model,'../Exp/Square.exp',700000);
     3md=triangle(model,'../Exp/Square.exp',700000);
    44md=setmask(md,'all','');
    55md=parameterize(md,'../Par/SquareShelf.par');
    66md=setflowequation(md,'macayeal','all');
    77md=extrude(md,3,1);
    8 md.cluster=generic('name',oshostname(),'np',3);
     8md.cluster=generic('name',oshostname(),'np',1);
    99md.transient.isthermal=0;
    1010

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

    r10430 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    … …  
    88md.initialization.vel(:)=0;
    99
    10 md.settings.results_on_vertices=1;
    1110md.cluster=generic('name',oshostname,'np',2);
    1211md=solve(md,DiagnosticSolutionEnum);

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

    r10382 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    … …  
    99md.initialization.vel(:)=0;
    1010
    11 md.settings.results_on_vertices=1;
    1211md.cluster=generic('name',oshostname,'np',3);
    1312md=solve(md,DiagnosticSolutionEnum);

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

    r10396 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    … …  
    99md.initialization.vel(:)=0;
    1010
    11 md.settings.results_on_vertices=1;
    1211md.cluster=generic('name',oshostname,'np',3);
    1312md=solve(md,DiagnosticSolutionEnum);

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/SquareHole.exp','../Exp/Rifts.exp',50000);
     1md=triangle(model,'../Exp/SquareHole.exp','../Exp/Rifts.exp',50000);
    22md=meshprocessrifts(md,'../Exp/Square.exp');
    33md=setmask(md,'all','');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',120000);
     1md=triangle(model,'../Exp/Square.exp',120000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',120000);
     1md=triangle(model,'../Exp/Square.exp',120000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',120000);
     1md=triangle(model,'../Exp/Square.exp',120000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',120000);
     1md=triangle(model,'../Exp/Square.exp',120000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',350000);
     1md=triangle(model,'../Exp/Square.exp',350000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',350000);
     1md=triangle(model,'../Exp/Square.exp',350000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',350000);
     1md=triangle(model,'../Exp/Square.exp',350000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',350000);
     1md=triangle(model,'../Exp/Square.exp',350000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=meshconvert(md);
    33md=setmask(md,'','');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=meshconvert(md);
    33md=setmask(md,'','');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r9750 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',300000);
     1md=triangle(model,'../Exp/Square.exp',300000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r9750 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',300000);
     1md=triangle(model,'../Exp/Square.exp',300000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r9750 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r9750 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r9703 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r9725 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',170000);
     1md=triangle(model,'../Exp/Square.exp',170000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',170000);
     1md=triangle(model,'../Exp/Square.exp',170000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',170000);
     1md=triangle(model,'../Exp/Square.exp',170000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',170000);
     1md=triangle(model,'../Exp/Square.exp',170000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r9703 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r9725 r11027  
    11%test partitioning, and partition averaging
    2 md=setmesh(model,'../Exp/Square.exp',30000);
     2md=triangle(model,'../Exp/Square.exp',30000);
    33md=setmask(md,'../Exp/SquareShelf.exp','');
    44md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r9770 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r9770 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',200000);
     1md=triangle(model,'../Exp/Square.exp',200000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,5,1);
    55md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','pattyn');
    6 md.cluster=generic('name',oshostname(),'np',7);
     6md.cluster=generic('name',oshostname(),'np',3);
    77md=solve(md,DiagnosticSolutionEnum);
    88

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',180000);
     1md=triangle(model,'../Exp/Square.exp',180000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',350000);
     1md=triangle(model,'../Exp/Square.exp',350000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',350000);
     1md=triangle(model,'../Exp/Square.exp',350000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Square.exp',150000);
     1md=triangle(model,'../Exp/Square.exp',150000);
    22md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',20000);
     1md=triangle(model,'../Exp/Pig.exp',20000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',20000);
     1md=triangle(model,'../Exp/Pig.exp',20000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',20000);
     1md=triangle(model,'../Exp/Pig.exp',20000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',20000);
     1md=triangle(model,'../Exp/Pig.exp',20000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',20000);
     1md=triangle(model,'../Exp/Pig.exp',20000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',20000);
     1md=triangle(model,'../Exp/Pig.exp',20000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',20000);
     1md=triangle(model,'../Exp/Pig.exp',20000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',20000);
     1md=triangle(model,'../Exp/Pig.exp',20000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',20000);
     1md=triangle(model,'../Exp/Pig.exp',20000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',20000);
     1md=triangle(model,'../Exp/Pig.exp',20000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',10000);
     1md=triangle(model,'../Exp/Pig.exp',10000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',10000);
     1md=triangle(model,'../Exp/Pig.exp',10000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',20000);
     1md=triangle(model,'../Exp/Pig.exp',20000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',20000);
     1md=triangle(model,'../Exp/Pig.exp',20000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/Pig.exp',30000);
     1md=triangle(model,'../Exp/Pig.exp',30000);
    22md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=meshconvert(md);
    33md=setmask(md,'../Exp/79NorthShelf.exp','');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=meshconvert(md);
    33md=setmask(md,'../Exp/79NorthShelf.exp','');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=meshconvert(md);
    33md=setmask(md,'../Exp/79NorthShelf.exp','');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=meshconvert(md);
    33md=setmask(md,'../Exp/79NorthShelf.exp','');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=meshconvert(md);
    33md=setmask(md,'../Exp/79NorthShelf.exp','');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=meshconvert(md);
    33md=setmask(md,'../Exp/79NorthShelf.exp','');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=meshconvert(md);
    33md=setmask(md,'../Exp/79NorthShelf.exp','');

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

    r10981 r11027  
    1 md=setmesh(model,'../Exp/79North.exp',10000);
     1md=triangle(model,'../Exp/79North.exp',10000);
    22md=meshconvert(md);
    33md=setmask(md,'../Exp/79NorthShelf.exp','');
Note: See TracChangeset for help on using the changeset viewer.