Changeset 19716

Timestamp:

11/12/15 21:07:00 (9 years ago)

Author:

Eric.Larour

Message:

CHG: new ElementConnectivity javascript module. Simplified the WRAPPER macro, back to what it
was before javascript modifications. The header file for the wrapper now defines WRAPPER.

Location:

issm/trunk-jpl/src

Files:

• m/mesh/triangle.js (modified) (1 diff)
• wrappers/ElementConnectivity/ElementConnectivity.h (modified) (1 diff)
• wrappers/ElementConnectivity/ElementConnectivity.js (added)
• wrappers/NodeConnectivity/NodeConnectivity.cpp (modified) (1 diff)
• wrappers/NodeConnectivity/NodeConnectivity.h (modified) (2 diffs)
• wrappers/TriMesh/TriMesh.cpp (modified) (1 diff)
• wrappers/TriMesh/TriMesh.h (modified) (1 diff)
• wrappers/javascript/Makefile.am (modified) (2 diffs)

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

@@ -54 +54 @@
         //Now, build the connectivity tables for this mesh.
         md.mesh.vertexconnectivity=NodeConnectivity(md.mesh.elements,md.mesh.numberofvertices);
-        //md.mesh.elementconnectivity=ElementConnectivity(md.mesh.elements,md.mesh.vertexconnectivity); 
+        md.mesh.elementconnectivity=ElementConnectivity(md.mesh.elements,md.mesh.vertexconnectivity);   
 
 }

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

@@ -45 +45 @@
 #endif
 
+#ifdef _HAVE_JAVASCRIPT_MODULES_
+/* serial input macros: */
+#define ELEMENTS         elementsin, nelsin,3
+#define NODECONNECTIVITY nodeconnectivityin, nodsin, widthin
+/* serial output macros: */
+#define ELEMENTCONNECTIVITY pelementconnectivity,NULL,NULL
+#undef WRAPPER
+#define WRAPPER(modulename) extern "C" { int  ElementConnectivityModule(double** pelementconnectivity, int* elementsin, int* nodeconnectivityin, int nelsin, int nodsin, int widthin)
+#endif
+
 /* serial arg counts: */
 #undef NLHS

issm/trunk-jpl/src/wrappers/NodeConnectivity/NodeConnectivity.cpp

@@ -10 +10 @@
         _printf0_("\n");
 }/*}}}*/
-WRAPPER(NodeConnectivity, double** pconnectivity, int* pnods, int *pwidth, int* elementsin, int nelsin, int nodsin){
+WRAPPER(NodeConnectivity){
 
         /*inputs: */

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

@@ -22 +22 @@
 /*Header files: */
 #include "../bindings.h"
-#ifndef _HAVE_JAVASCRIPT_MODULES_
 #include "../../c/main/globals.h"
-#endif
 #include "../../c/toolkits/toolkits.h"
 #include "../../c/modules/modules.h"
@@ -53 +51 @@
 /* serial output macros: */
 #define CONNECTIVITY pconnectivity,pnods,pwidth
+#undef WRAPPER
+#define WRAPPER(modulename) extern "C" { int  NodeConnectivityModule(double** pconnectivity, int* pnods, int *pwidth, int* elementsin, int nelsin, int nodsin)
 #endif
 

issm/trunk-jpl/src/wrappers/TriMesh/TriMesh.cpp

@@ -14 +14 @@
         _printf_("\n");
 }/*}}}*/
-WRAPPER(TriMesh,double** pindex, double** px, double** py, int* pnel, int* pnods, double** psegments, double** psegmentmarkers, int* pnsegs, double* domainx, double* domainy, int domainnods, double areain){
+WRAPPER(TriMesh){
         
-
         /*intermediary: */
         double    area;

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

@@ -71 +71 @@
 #define SEGMENTS          psegments,pnsegs
 #define SEGMENTMARKERLIST psegmentmarkers,pnsegs
+#undef WRAPPER
+#define WRAPPER(modulename) extern "C" { int  TriMeshModule(double** pindex, double** px, double** py, int* pnel, int* pnods, double** psegments, double** psegmentmarkers, int* pnsegs, double* domainx, double* domainy, int domainnods, double areain)
 #define _DO_NOT_LOAD_GLOBALS_//we only load globals for TriMeshModule.js, not other modules!
 #endif

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

@@ -9 +9 @@
 bin_SCRIPTS = 
 bin_SCRIPTS += ../TriMesh/TriMesh.js  \
-                           ../NodeConnectivity/NodeConnectivity.js
+                           ../NodeConnectivity/NodeConnectivity.js\
+                           ../ElementConnectivity/ElementConnectivity.js
         
 #javascript io{{{
@@ -73 +74 @@
 
 IssmModule_SOURCES = ../TriMesh/TriMesh.cpp \
-                                         ../NodeConnectivity/NodeConnectivity.cpp
-IssmModule_CXXFLAGS= -fPIC -D_DO_NOT_LOAD_GLOBALS_ --memory-init-file 0 $(AM_CXXFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) -s EXPORTED_FUNCTIONS="['_TriMeshModule','_NodeConnectivityModule']"  -s DISABLE_EXCEPTION_CATCHING=0
+                                         ../NodeConnectivity/NodeConnectivity.cpp\
+                                         ../ElementConnectivity/ElementConnectivity.cpp
+
+IssmModule_CXXFLAGS= -fPIC -D_DO_NOT_LOAD_GLOBALS_ --memory-init-file 0 $(AM_CXXFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) -s EXPORTED_FUNCTIONS="['_TriMeshModule','_NodeConnectivityModule','_ElementConnectivityModule']"  -s DISABLE_EXCEPTION_CATCHING=0
 IssmModule_LDADD = ${deps} $(TRIANGLELIB) 
 #}}}