Changeset 23045

Timestamp:

08/02/18 16:36:49 (7 years ago)

Author:

jdquinn

Message:

CHG: Converted all Promises to success/warning/error callback model

Location:

issm/trunk-jpl

Files:

• jenkins/macosx_pine-island (modified) (1 diff)
• jenkins/macosx_pine-island_static (modified) (2 diffs)
• src/c/classes/FemModel.cpp (modified) (1 diff)
• src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (modified) (1 diff)
• src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.js (modified) (1 diff)

issm/trunk-jpl/jenkins/macosx_pine-island

@@ -5 +5 @@
 
 #MATLAB path
-MATLAB_PATH="/Applications/MATLAB_R2015b.app/"
+MATLAB_PATH="/Applications/MATLAB_R2017b.app/"
 
 #ISSM CONFIGURATION 

issm/trunk-jpl/jenkins/macosx_pine-island_static

@@ -5 +5 @@
 
 #MATLAB path
-MATLAB_PATH="/Applications/MATLAB_R2015b.app/"
+MATLAB_PATH="/Applications/MATLAB_R2017b.app/"
 
 #ISSM CONFIGURATION 
@@ -23 +23 @@
         --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
         --with-math77-dir=$ISSM_DIR/externalpackages/math77/install \
-        --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a /usr/local/gfortran/lib/libquadmath.a /usr/local/gfortran/lib/gcc/x86_64-apple-darwin14/5.2.0/libgcc.a" \
+        --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a /usr/local/gfortran/lib/libquadmath.a /usr/local/gfortran/lib/gcc/x86_64-apple-darwin15/6.1.0/libgcc.a" \
         --with-numthreads=4'
 

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -4824 +4824 @@
         /*Open output file once for all and add output file descriptor to parameters*/
         output_fid=open_memstream(&outputbuffer,&outputsize); 
-        if(output_fid==NULL)_error_("could not initialize output stream");
+        if(output_fid==NULL||output_fid==0)_error_("could not initialize output stream");
         this->parameters->SetParam(output_fid,OutputFilePointerEnum);
         this->parameters->AddObject(new GenericParam<char**>(&outputbuffer,OutputBufferPointerEnum));

issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp

@@ -24 +24 @@
         double* y=NULL;
         int     i;
+
+        // TEST
+        _printf_("\r      N: "<<N<<" M:"<<M<<"\n");
 
         /*Some checks on arguments: */

issm/trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.js

@@ -99 +99 @@
         nods            = xMeshIn.length;
         meshNumRows     = xMeshIn.length;
+        console.log('InterpFromGridToMesh.js: meshNumRows => ' + meshNumRows);