source: issm/oecreview/Archive/12678-13393/ISSM-13188-13189.diff@ 13980

Last change on this file since 13980 was 13394, checked in by Mathieu Morlighem, 13 years ago

Added 12678-13393
File size: 1.3 KB
RevLine 
[13394]1Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/startup.py
2===================================================================
3--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/startup.py (revision 13188)
4+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/startup.py (revision 13189)
5@@ -42,7 +42,7 @@
6 file=os.path.splitext(file)[0]
7 #__import__(file)
8
9-sys.path.append(ISSM_DIR + '/src/modules/python')
10+sys.path.append(ISSM_DIR + '/lib')
11
12 #Deal with scipy import:
13 import scipy
14Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment.sh
15===================================================================
16--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment.sh (revision 13188)
17+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/etc/environment.sh (revision 13189)
18@@ -200,10 +200,10 @@
19
20 PYTHON_DIR="$ISSM_DIR/externalpackages/python/install"
21 if [ -d "$PYTHON_DIR" ]; then
22- export PYTHONPATH="$PYTHONPATH:$ISSM_DIR/src/modules/python"
23+ export PYTHONPATH="$PYTHONPATH:$ISSM_DIR/lib"
24 export PYTHONSTARTUP="$ISSM_DIR/startup.py"
25 pathprepend "$PYTHON_DIR/bin"
26- libpathprepend "$ISSM_DIR/src/modules/python"
27+ libpathprepend "$ISSM_DIR/lib"
28 libpathprepend "$PYTHON_DIR/lib"
29 fi
30
Note: See TracBrowser for help on using the repository browser.