source: issm/oecreview/Archive/12121-12140/ISSM-12128-12129.diff@ 12325

Last change on this file since 12325 was 12325, checked in by Eric.Larour, 13 years ago

11990 to 12321 oec compliance
File size: 2.6 KB
RevLine 
[12325]1Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/triangle/triangle.c.patch.python
2===================================================================
3--- /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/triangle/triangle.c.patch.python (revision 12128)
4+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/externalpackages/triangle/triangle.c.patch.python (revision 12129)
5@@ -4,8 +4,8 @@
6 > * matlab, we had to change the allocation routine trimalloc, as well as the
7 > * double precision activation in exactinit(); The rest is not changed.
8 > * We also created the ice_makefile to compile Triangle into a library. */
9-> #include <mat.h>
10-> #include <matrix.h>
11+> /* #include <mat.h>
12+> #include <matrix.h> */
13 > #define ANSI_DECLARATORS
14 > #define NO_TIMER
15 >
16Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/configs/config-arm.sh
17===================================================================
18--- /proj/ice/larour/issm-uci-clean/trunk-jpl/configs/config-arm.sh (revision 12128)
19+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/configs/config-arm.sh (revision 12129)
20@@ -1,12 +0,0 @@
21-#!/bin/sh
22-
23-pythonversion=2.7
24-
25-./configure \
26- --prefix=$ISSM_TIER \
27- --with-python-dir=$ISSM_TIER/externalpackages/python/install\
28- --with-python-version=$pythonversion \
29- --with-python-numpy-dir=$ISSM_TIER/externalpackages/python/install/Python.framework/Versions/$pythonversion/lib/python$pythonversion/site-packages/numpy/core/include/numpy\
30- --with-vendor=arm \
31- --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
32- --with-gsl-dir=$ISSM_TIER/externalpackages/gsl/install
33Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/configs/config-arm-linux.sh
34===================================================================
35--- /proj/ice/larour/issm-uci-clean/trunk-jpl/configs/config-arm-linux.sh (revision 0)
36+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/configs/config-arm-linux.sh (revision 12129)
37@@ -0,0 +1,12 @@
38+#!/bin/sh
39+
40+pythonversion=2.7
41+
42+./configure \
43+ --prefix=$ISSM_TIER \
44+ --with-python-dir=$ISSM_TIER/externalpackages/python/install\
45+ --with-python-version=$pythonversion \
46+ --with-python-numpy-dir=$ISSM_TIER/externalpackages/python/install/Python.framework/Versions/$pythonversion/lib/python$pythonversion/site-packages/numpy/core/include/numpy\
47+ --with-vendor=arm-linux\
48+ --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
49+ --with-gsl-dir=$ISSM_TIER/externalpackages/gsl/install
50
51Property changes on: /proj/ice/larour/issm-uci-clean/trunk-jpl/configs/config-arm-linux.sh
52___________________________________________________________________
53Added: svn:executable
54 + *
55
Note: See TracBrowser for help on using the repository browser.