Changeset 22677

Timestamp:

04/05/18 23:20:01 (8 years ago)

Author:

dlcheng

Message:

CHG (JS): Fixing syntax issue in thermal.js. Adding InterpFromGridToMesh to exported functions in js builds.

Location:

issm/trunk-jpl/src

Files:

• m/classes/thermal.js (modified) (1 diff)
• wrappers/javascript/Makefile.am (modified) (1 diff)

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

@@ -92 +92 @@
                 checkfield(md,'fieldname','thermal.stabilization','numel',[1],'values',[0 ,1, 2]);
                 checkfield(md,'fieldname','thermal.spctemperature','Inf',1,'timeseries',1);
-                checkfield(md,'fieldname','thermal.fe','values',{'P1','P1xP2','P1xP3'});
+                checkfield(md,'fieldname','thermal.fe','values',['P1','P1xP2','P1xP3']);
                 if(ArrayAnyEqual(ArrayIsMember('EnthalpyAnalysis',analyses),1) & md.thermal.isenthalpy & md.mesh.dimension() == 3){
                         

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

@@ -91 +91 @@
                                          ../Issm/issm.cpp
 
-IssmModule_CXXFLAGS= -fPIC -D_DO_NOT_LOAD_GLOBALS_  --memory-init-file 0 $(AM_CXXFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) -s EXPORTED_FUNCTIONS="['_TriangleModule','_NodeConnectivityModule','_ContourToMeshModule','_ElementConnectivityModule','_InterpFromMeshToMesh2dModule','_IssmConfigModule','_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="['_TriangleModule','_NodeConnectivityModule','_ContourToMeshModule','_ElementConnectivityModule','_InterpFromGridToMeshModule','_InterpFromMeshToMesh2dModule','_IssmConfigModule','_IssmModule']"  -s DISABLE_EXCEPTION_CATCHING=0 -s ALLOW_MEMORY_GROWTH=1 -s INVOKE_RUN=0
 IssmModule_LDADD = ${deps} $(TRIANGLELIB)  $(GSLLIB)
 #}}}