Changeset 19838

Timestamp:

11/30/15 17:23:25 (9 years ago)

Author:

Eric.Larour

Message:

NEW(JAVASCRIPT): new ContourToMesh module.

Location:

issm/trunk-jpl/src/wrappers

Files:

• ContourToMesh/ContourToMesh.h (modified) (1 diff)
• ContourToMesh/ContourToMesh.js (added)
• javascript/Makefile.am (modified) (3 diffs)
• javascript/io/WriteJavascriptData.cpp (modified) (1 diff)
• javascript/io/javascriptio.h (modified) (1 diff)

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

@@ -55 +55 @@
 #endif
 
+#ifdef _HAVE_JAVASCRIPT_MODULES_
+/* serial input macros: */
+#define INDEX       indexin,nelin,3
+#define X           xin,nodsin,1
+#define Y           yin,nodsin,1
+#define CONTOUR     contourx,contoury,contour_nods
+#define INTERPTYPE  interptypein
+#define EDGEVALUE   valuein
+#define WRAPPER(modulename) extern "C" { int  ContourToMeshModule(double** pin_nod, double** pin_nel, double* indexin, double* xin, double* yin, double* contourx, double* contoury, char* interptypein, int nelin, int nodsin, int contour_nods, double valuein)
+/* serial output macros: */
+#define PLHS0 pin_nod,NULL
+#define PLHS1 pin_nel,NULL
+#define nrhs 6
+#endif
+
 /* serial arg counts: */
 #undef NLHS

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

@@ -10 +10 @@
 bin_SCRIPTS += ../TriMesh/TriMesh.js  \
                            ../NodeConnectivity/NodeConnectivity.js\
+                           ../ContourToMesh/ContourToMesh.js\
                            ../ElementConnectivity/ElementConnectivity.js\
                            ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.js\
@@ -80 +81 @@
 IssmModule_SOURCES = ../TriMesh/TriMesh.cpp \
                                          ../NodeConnectivity/NodeConnectivity.cpp\
+                                         ../ContourToMesh/ContourToMesh.cpp\
                                          ../ElementConnectivity/ElementConnectivity.cpp\
                                          ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp\
@@ -87 +89 @@
                                          ../Issm/issm.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','_EnumToStringModule','_StringToEnumModule','_IssmModule']"  -s DISABLE_EXCEPTION_CATCHING=0 -s ALLOW_MEMORY_GROWTH=1 -s INVOKE_RUN=0
+IssmModule_CXXFLAGS= -fPIC -D_DO_NOT_LOAD_GLOBALS_  --memory-init-file 0 $(AM_CXXFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) -s EXPORTED_FUNCTIONS="['_TriMeshModule','_NodeConnectivityModule','_ContourToMeshModule','_ElementConnectivityModule','_InterpFromMeshToMesh2dModule','_IssmConfigModule','_EnumToStringModule','_StringToEnumModule','_IssmModule']"  -s DISABLE_EXCEPTION_CATCHING=0 -s ALLOW_MEMORY_GROWTH=1 -s INVOKE_RUN=0
 IssmModule_LDADD = ${deps} $(TRIANGLELIB)  $(GSLLIB)
 #}}}

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

@@ -84 +84 @@
 }
 /*}}}*/
+/*FUNCTION WriteData(IssmPDouble** pdouble, void* nullptr){{{*/
+void WriteData(IssmPDouble** pdouble, void*){
+        //do nothing
+}
+/*}}}*/
 /*FUNCTION WriteData(char** pstring, char* string){{{*/
 void WriteData(char** pstring, char* stringin){

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

@@ -25 +25 @@
 void WriteData(char** pstring, char* stringin);
 void WriteData(IssmPDouble* pdouble, IssmPDouble doublein);
+void WriteData(IssmPDouble** pdouble, void*);
 
 void FetchData(char** pstring, char* stringin);