Changeset 19721

Timestamp:

11/16/15 15:54:40 (9 years ago)

Author:

Eric.Larour

Message:

CHG: getting the plotmodel capability online.

Location:

issm/trunk-jpl/src/m

Files:

• array/ArrayOperations.js (modified) (4 diffs)
• classes/mesh2d.js (modified) (1 diff)
• classes/pairoptions.js (added)
• classes/plotoptions.js (added)
• geometry/FlagElements.js (modified) (2 diffs)
• mesh/triangle.js (modified) (1 diff)
• miscellaneous/fielddisplay.js (modified) (1 diff)
• parameterization/setmask.js (modified) (4 diffs)
• plot/checkplotoptions.js (added)
• plot/plot_manager.js (added)
• plot/plot_unit.js (added)
• plot/plotmodel.js (added)
• plot/processdata.js (added)
• plot/processmesh.js (added)

issm/trunk-jpl/src/m/array/ArrayOperations.js

@@ -15 +15 @@
 function ArrayMin(array){ //{{{
         return Math.min.apply(null,array);
+} //}}}
+function ArraySum(array){ //{{{
+        var sum=0;
+        for(var i=0;i<array.length;i++)sum+=array[i];
+        return sum;
 } //}}}
 function ArrayMin2D(array){ //{{{
@@ -47 +52 @@
         var list= new Array(width*length);
 
-        for (i=0;i<length;i++){
-                for(j=0;j<width;j++){
+        for(var i=0;i<length;i++){
+                for(var j=0;j<width;j++){
                         list[i*width+j]=matrix[i][j];
                 }
@@ -68 +73 @@
         for (i=0;i<array.length;i++)notarray[i]=-array[i];
         return notarray;
+} //}}}
+function ArrayAnyNaN(array) { //{{{
+
+        for(var i=0;i<array.length;i++){
+                if (isNaN(array[i])) return 1;
+        }
+        return 0;
 } //}}}
 function ArrayAnd(array1,array2) { //{{{
@@ -98 +110 @@
         return indices;
 } //}}}
+function ArrayFindNot(array,value) { //{{{
+        
+        //find number of indices
+        var count=0;
+        for (i=0;i<array.length;i++)if(array[i]!=value)count++;
+
+        //allocate:
+        var indices= NewArrayFill(count,0);
+
+        //fill in:
+        count=0;
+        for (i=0;i<array.length;i++){
+                if(array[i]!=value){
+                        indices[count]=i;
+                        count++;
+                }
+        }
+        return indices;
+} //}}}
+function Create2DArray(rows,cols) { //{{{
+        var arr = [];
+
+        for (var i=0;i<rows;i++) {
+                arr[i] = new Array(cols);
+        }
+
+        return arr;
+} //}}}

issm/trunk-jpl/src/m/classes/mesh2d.js

@@ -44 +44 @@
                         fielddisplay(this,"epsg","EPSG code (ex: 3413 for UPS Greenland, 3031 for UPS Antarctica)");
                 } //}}}
+                this.domaintype=function (){ // {{{
+                        return '2Dhorizontal';
+                } // }}}
+                this.dimension = function () { //{{{
+                        return 2;
+                } //}}}
+                this.elementtype = function() {//{{{
+                        return 'Tria';
+                } // }}}
         //properties 
         // {{{

issm/trunk-jpl/src/m/geometry/FlagElements.js

@@ -34 +34 @@
                         for (i=0;i<md.mesh.numberofelements;i++)
                                 var sum=0;
-                                for(j=0;j<md.mesh.elements[0].length;j++){
+                                for(var j=0;j<md.mesh.elements[0].length;j++){
                                         sum += region[md.mesh.element[i][j]-1];
                                 }
@@ -40 +40 @@
                 }
                 else{
-                        console.error('Flaglist for region must be of same size as number of elements in model');
+                        throw Error('Flaglist for region must be of same size as number of elements in model');
                 }
         }
         else{
-                console.error('Invalid region option');
+                throw Error('Invalid region option');
         }
         return flag;

issm/trunk-jpl/src/m/mesh/triangle.js

@@ -50 +50 @@
         md.mesh.vertexonboundary=new Float64Array(md.mesh.numberofvertices); 
 
-        for (i=0;i<md.mesh.segments.length;i++) for(j=0;j<2;j++) md.mesh.vertexonboundary[md.mesh.segments[i][j]-1]=1;
+        for (i=0;i<md.mesh.segments.length;i++) for(var j=0;j<2;j++) md.mesh.vertexonboundary[md.mesh.segments[i][j]-1]=1;
 
         //Now, build the connectivity tables for this mesh.

issm/trunk-jpl/src/m/miscellaneous/fielddisplay.js

@@ -85 +85 @@
                 }
                 else{
-                        console.error("fielddisplay error message: format for comment not supported yet");
+                        throw Error("fielddisplay error message: format for comment not supported yet");
                 }
         }

issm/trunk-jpl/src/m/parameterization/setmask.js

@@ -26 +26 @@
         //some checks on list of arguments
         if (!((arguments.length==3) | (arguments.length==5))){
-                console.error('mask error message: wrong usage.');
+                throw Error('mask error message: wrong usage.');
         }
 
@@ -34 +34 @@
                 }
                 else{
-                        console.error('mask error message: wrong field specified. Only icedomain allowed for now.');
+                        throw Error('mask error message: wrong field specified. Only icedomain allowed for now.');
                 }
                 if (IsArray(icedomain)){
-                        console.error('setmask error message: icedomain should be an array!');
+                        throw Error('setmask error message: icedomain should be an array!');
                 }
         }
@@ -59 +59 @@
         vertexonfloatingice=NewArrayFill(md.mesh.numberofvertices,0);
         vertexongroundedice=NewArrayFill(md.mesh.numberofvertices,0);
-        pos=ArrayFind(elementongroundedice,1); for (i=0;i<pos.length;i++)for(j=0;j<3;j++) vertexongroundedice[md.mesh.elements[i,j]-1]=1;
+        pos=ArrayFind(elementongroundedice,1); for (i=0;i<pos.length;i++)for(var j=0;j<3;j++) vertexongroundedice[md.mesh.elements[i,j]-1]=1;
         pos=ArrayFind(vertexongroundedice,0); for (i=0;i<pos.length;i++)vertexonfloatingice[i]=1;
 
         //level sets
         groundedice_levelset=vertexongroundedice;
-        pos=ArrayFind(vertexongroundedice,0);for(i=0;i<pos.length;i++) groundedice_levelset[i]=-1;
+        pos=ArrayFind(vertexongroundedice,0);for(var i=0;i<pos.length;i++) groundedice_levelset[i]=-1;
         md.mask.groundedice_levelset=groundedice_levelset;
 
@@ -71 +71 @@
                 //use contourtomesh to set ice values inside ice domain
                 [vertexinsideicedomain,elementinsideicedomain]=ContourToMesh(elements,x,y,icedomain,'node',1);
-                pos=ArrayFind(vertexinsideicedomain,1.0);for(i=0;i<pos.length;i++) md.mask.ice_levelset[pos]=-1;
+                pos=ArrayFind(vertexinsideicedomain,1.0);for(var i=0;i<pos.length;i++) md.mask.ice_levelset[pos]=-1;
         }
         else{