Changeset 19768

Timestamp:

11/19/15 20:01:24 (9 years ago)

Author:

Eric.Larour

Message:

CHG: new EnumToString and StringToEnum javascript modules. New array operations.
Finished translating setflowequation javascript routine. Finished parameterization file
SquareShelfConstrained.js. Starting solve.js routine.

Location:

issm/trunk-jpl

Files:

• src/m/array/arrayoperations.js (modified) (3 diffs)
• src/m/parameterization/setflowequation.js (added)
• src/wrappers/EnumToString/EnumToString.h (modified) (1 diff)
• src/wrappers/EnumToString/EnumToString.js (added)
• src/wrappers/StringToEnum/StringToEnum.h (modified) (1 diff)
• src/wrappers/StringToEnum/StringToEnum.js (added)
• src/wrappers/javascript/Makefile.am (modified) (2 diffs)
• src/wrappers/javascript/io/FetchJavascriptData.cpp (modified) (1 diff)
• src/wrappers/javascript/io/javascriptio.h (modified) (1 diff)
• test/Exp/Square.js (modified) (1 diff)
• test/Par/SquareShelfConstrained.js (modified) (2 diffs)

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

@@ -21 +21 @@
         return sum;
 } //}}}
+function ArrayXPY(){ //{{{
+    if (arguments.length<2)throw Error("ArrayXPY error message: sum has to be for at least two arrays!");
+
+        //check internal consistency of arrays provided!: 
+        var firstarray=arguments[0];
+        var firstsize=firstarray.length;
+        
+        for(var a=1;a<arguments.length;a++){
+                var array=arguments[a];
+                if(array.length!=firstsize)throw Error("ArrayXPY error message: arrays provided as arguments are not of the same length!");
+        }
+
+        //do the sum:
+        var sum=NewArrayFill(firstsize,0);
+        for(var a=0;a<arguments.length;a++){
+                var array=arguments[a];
+                for(var i=0;i<array.length;i++){
+                        sum[i]+=array[i];
+                }
+        }
+        return sum;
+
+} //}}}
+function ArrayOr(){ //{{{
+    if (arguments.length<2)throw Error("ArrayOr error message: sum has to be for at least two arrays!");
+
+        //check internal consistency of arrays provided!: 
+        var firstarray=arguments[0];
+        var firstsize=firstarray.length;
+        
+        for(var a=1;a<arguments.length;a++){
+                var array=arguments[a];
+                if(array.length!=firstsize)throw Error("ArrayOr error message: arrays provided as arguments are not of the same length!");
+        }
+
+        //do the or:
+        var or=NewArrayFill(firstsize,0);
+        for(var a=0;a<arguments.length;a++){
+                var array=arguments[a];
+                for(var i=0;i<array.length;i++){
+                        or[i] = or[i] | array[i];
+                }
+        }
+        return or;
+
+} //}}}
 function ArrayMin2D(array){ //{{{
         
@@ -99 +145 @@
         return 0;
 } //}}}
+function ArrayAnyEqual(array,value) { //{{{
+
+        for(var i=0;i<array.length;i++){
+                if (array[i]==value)return 1;
+        }
+        return 0;
+} //}}}
 function ArrayAnyBelowOrEqual(array,value) { //{{{
 
@@ -110 +163 @@
         for(var i=0;i<array.length;i++){
                 if (array[i]<value)return 1;
+        }
+        return 0;
+} //}}}
+function ArrayAnyAboveOrEqual(array,value) { //{{{
+
+        for(var i=0;i<array.length;i++){
+                if (array[i]>=value)return 1;
+        }
+        return 0;
+} //}}}
+function ArrayAnyAboveStrict(array,value) { //{{{
+
+        for(var i=0;i<array.length;i++){
+                if (array[i]>value)return 1;
         }
         return 0;

issm/trunk-jpl/src/wrappers/EnumToString/EnumToString.h

@@ -40 +40 @@
 #endif
 
+#ifdef _HAVE_JAVASCRIPT_MODULES_
+/* serial input macros: */
+#define ENUMIN enumin
+/* serial output macros: */
+#define NAME pstring
+#define WRAPPER(modulename) extern "C" { int  EnumToStringModule(char** pstring, int enumin)
+#endif
+
+
 /* serial arg counts: */
 #undef NLHS

issm/trunk-jpl/src/wrappers/StringToEnum/StringToEnum.h

@@ -40 +40 @@
 #endif
 
+#ifdef _HAVE_JAVASCRIPT_MODULES_
+/* serial input macros: */
+#define NAME string
+/* serial output macros: */
+#define ENUMOUT penum
+#define WRAPPER(modulename) extern "C" { int  StringToEnumModule(double* penum, char* string)
+#endif
+
 /* serial arg counts: */
 #undef NLHS

issm/trunk-jpl/src/wrappers/javascript/Makefile.am

@@ -12 +12 @@
                            ../ElementConnectivity/ElementConnectivity.js\
                            ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.js\
-                           ../IssmConfig/IssmConfig.js
+                           ../IssmConfig/IssmConfig.js\
+                           ../EnumToString/EnumToString.js\
+                           ../StringToEnum/StringToEnum.js
         
 #javascript io{{{
@@ -79 +81 @@
                                          ../ElementConnectivity/ElementConnectivity.cpp\
                                          ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp\
-                                         ../IssmConfig/IssmConfig.cpp
+                                         ../IssmConfig/IssmConfig.cpp\
+                                         ../EnumToString/EnumToString.cpp\
+                                         ../StringToEnum/StringToEnum.cpp
 
-IssmModule_CXXFLAGS= -fPIC -D_DO_NOT_LOAD_GLOBALS_ --memory-init-file 0 $(AM_CXXFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) -s EXPORTED_FUNCTIONS="['_TriMeshModule','_NodeConnectivityModule','_ElementConnectivityModule','_InterpFromMeshToMesh2dModule','_IssmConfigModule']"  -s DISABLE_EXCEPTION_CATCHING=0 -s ALLOW_MEMORY_GROWTH=1
+IssmModule_CXXFLAGS= -fPIC -D_DO_NOT_LOAD_GLOBALS_ --memory-init-file 0 $(AM_CXXFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) -s EXPORTED_FUNCTIONS="['_TriMeshModule','_NodeConnectivityModule','_ElementConnectivityModule','_InterpFromMeshToMesh2dModule','_IssmConfigModule','_EnumToStringModule','_StringToEnumModule']"  -s DISABLE_EXCEPTION_CATCHING=0 -s ALLOW_MEMORY_GROWTH=1
 IssmModule_LDADD = ${deps} $(TRIANGLELIB) 
 #}}}

issm/trunk-jpl/src/wrappers/javascript/io/FetchJavascriptData.cpp

@@ -22 +22 @@
 }
 /*}}}*/
+/*FUNCTION FetchData(int* pinteger,int integer){{{*/
+void FetchData(int* pinteger,int integer){
+        
+        *pinteger = integer;
+}
+/*}}}*/
 /*FUNCTION FetchData(double* pscalar,double scalar){{{*/
 void FetchData(double* pscalar,double scalar){
         
         *pscalar = scalar;
-}
-/*}}}*/
-/*FUNCTION FetchData(double* pscalar,double scalar){{{*/
-void FetchData(int* pinteger,int integer){
-        
-        *pinteger = integer;
 }
 /*}}}*/

issm/trunk-jpl/src/wrappers/javascript/io/javascriptio.h

@@ -36 +36 @@
 void FetchData(Contours** pcontours,double* x, double* y, int nods);
 void FetchData(Options** poptions,int NRHS, int nrhs, const char* optionname, double optionvalue);
+void FetchData(int* pinteger,int integer);
 
 /*Print*/

issm/trunk-jpl/test/Exp/Square.js

@@ -3 +3 @@
 // Points Count  Value
 var square={}
-square["nods"]=5;
+square[0]={};
+square[0]["nods"]=5;
 // X pos Y pos
-square["x"]=[0,1000000,1000000,0,0];
-square["y"]=[0, 0, 1000000,  1000000, 0];
+square[0]["x"]=[0,1000000,1000000,0,0];
+square[0]["y"]=[0, 0, 1000000,  1000000, 0];

issm/trunk-jpl/test/Par/SquareShelfConstrained.js

@@ -52 +52 @@
         //Numerical parameters
         md.stressbalance.viscosity_overshoot=0.0;
-        return;
         md.masstransport.stabilization=1;
         md.thermal.stabilization=1;
-        md.verbose=verbose(0);
+        md.verbose=new verbose(0);
         md.settings.waitonlock=30;
         md.stressbalance.restol=0.05;
@@ -65 +64 @@
 
         //Deal with boundary conditions:
-        md=SetIceShelfBC(md);
+        SetIceShelfBC(md);
 
         //Change name so that no tests have the same name
-        //A=dbstack;
-        //if (length(A)>2), md.miscellaneous.name=A(3).file(1:end-2); end
-
+        md.miscellaneous.name='test101';
 }