Merge branch 'main' of https://github.com/ISSMteam/ISSM

Author: TidbitSoftware

.gitignore

@@ -2,6 +2,7 @@
 #==================
 *.a
 *.al
+*.js
 *.la
 *.lo
 *.mexa64
@@ -10,6 +11,7 @@
 *.pyo
 *.so
 *.so.[0-9]*
+*.wasm
 __pycache__
 bin/
 lib/

externalpackages/triangle/configs/javascript/configure.make

@@ -1,4 +1,3 @@
-CXX=em++
-CXXSWITCHES=$(CFLAGS) -DNO_TIMER -fPIC -DANSI_DECLARATORS -DTRILIBRARY 
-TRILIBDEFS=-DTRILIBRARY -DANSI_DECLARATORS
-LIB_EXT=a
+CC=emcc
+CSWITCHES= $(CFLAGS) -DNO_TIMER -fpic
+TRILIBDEFS= -DTRILIBRARY

externalpackages/triangle/install-linux-javascript.sh renamed to externalpackages/triangle/install-javascript.sh

@@ -4,7 +4,7 @@ set -eu
 
 # Constants
 #
-export PREFIX="${ISSM_DIR}/externalpackages/triangle/install" # Set to location where external package should be installed
+export PREFIX="${ISSM_EXT_DIR}/javascript/triangle/install" # Set to location where external package should be installed
 
 # Environment
 #

jenkins/jenkins.sh

@@ -223,8 +223,8 @@ if [ $JAVASCRIPT_TEST -eq 1 ]; then
 	export AR=emar
 	export RANLIB=emranlib
 	#export EMCC_DEBUG=1 # Uncomment to enable debugging
-	export EMCC_CFLAGS="-s ERROR_ON_UNDEFINED_SYMBOLS=0" # Required after v1.38.14 to avoid undefined symbol warnings from our Fortran object files being treated as errors
-	source ${ISSM_DIR}/externalpackages/emscripten/install/emsdk_env.sh
+	export EMCC_CFLAGS="-sERROR_ON_UNDEFINED_SYMBOLS=0" # Required after v1.38.14 to avoid undefined symbol warnings from our Fortran object files being treated as errors
+	source ${EMSCRIPTEN_ROOT}/emsdk_env.sh
 fi
 
 # }}}

jenkins/ross-debian_linux-javascript

@@ -29,7 +29,7 @@ EXTERNALPACKAGES="
 	cmake		install.sh
 	emscripten	install.sh
 	gsl			install-javascript.sh
-	triangle	install-linux-javascript.sh
+	triangle	install-javascript.sh
 	shell2junit	install.sh
 "
 

src/wrappers/Triangle/Triangle.h

@@ -16,11 +16,6 @@
 #define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol
 #endif
 
-#ifdef _HAVE_JAVASCRIPT_MODULES_
-#undef _DO_NOT_LOAD_GLOBALS_ /*only module where this needs to be undefined, so as to 
-							   not include IssmComm several times in the JavaScript module construct.*/
-#endif
-
 /*Header files: */
 #include "../bindings.h"
 #include "../../c/main/globals.h"