Changeset 24313 for issm/trunk/jenkins/macosx_pine-island_dakota_static

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• jenkins/macosx_pine-island_dakota_static (modified) (3 diffs)

issm/trunk/jenkins/macosx_pine-island_dakota_static

@@ -13 +13 @@
         --with-matlab-dir=$MATLAB_PATH \
         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
+        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
         --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lpmpi -lmpifort -lmpicxx" \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
@@ -43 +43 @@
                                                 petsc        install-3.7-macosx64-static.sh
                                                 triangle     install-macosx64.sh
-                                                boost        install-1.55-macosx-el_capitan-static.sh
-                                                dakota       install-6.2-macosx64-static.sh
+                                                boost        install-1.55-macosx-el_capitan.sh
+                                                dakota       install-6.2-macosx64.sh
                                                 shell2junit  install.sh"
 
@@ -62 +62 @@
 #by Matlab and runme.m
 #ex: "'id',[101 102 103]"
-#PYTHON_NROPTIONS=""
-#MATLAB_NROPTIONS=""
+##                           bamg mesh   FS
+#PYTHON_NROPTIONS="--exclude_name 'Dakota'"
+#MATLAB_NROPTIONS="'exclude',[243,701,702,703,435,IdFromString('Dakota')]"