source: issm/oecreview/Archive/12678-13393/ISSM-12998-12999.diff

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

Added 12678-13393
File size: 7.9 KB
RevLine 
[13394]1Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/shell/issmdir.py
2===================================================================
3--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/shell/issmdir.py (revision 12998)
4+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/shell/issmdir.py (revision 12999)
5@@ -1,24 +0,0 @@
6-import platform
7-import os
8-from MatlabFuncs import *
9-
10-def issmdir():
11- """
12- ISSMDIR - Get ISSM_DIR environment variable
13-
14- Usage:
15- ISSM_DIR=issmdir()
16- """
17-
18- if not 'Windows' in platform.system():
19- ISSM_DIR =os.environ['ISSM_DIR']
20- else:
21- ISSM_DIR =os.environ['ISSM_DIR_WIN']
22- if strcmpi(ISSM_DIR[-1],'/') or strcmpi(ISSM_DIR[-1],'\\'):
23- ISSM_DIR = ISSM_DIR[:-1] #shave off the last '/'
24-
25- if not ISSM_DIR:
26- raise RuntimeError("issmdir error message: 'ISSM_DIR' environment variable is empty! You should define ISSM_DIR in your .cshrc or .bashrc!")
27-
28- return ISSM_DIR
29-
30Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/shell/flaimdir.m
31===================================================================
32--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/shell/flaimdir.m (revision 12998)
33+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/shell/flaimdir.m (revision 12999)
34@@ -1,7 +0,0 @@
35-function FLAIM_DIR=flaimdir()
36-%ISSMDIR - Get FLAIM installation directory
37-%
38-% Usage:
39-% FLAIM_DIR=flaimdir()
40-
41-FLAIM_DIR=[issmdir '/externalpackages/flaim/install'];
42Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/shell/ucisvn.m
43===================================================================
44--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/shell/ucisvn.m (revision 12998)
45+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/shell/ucisvn.m (revision 12999)
46@@ -1,15 +0,0 @@
47-function UCI_SVN=ucisvn()
48-%ISSMDIR - Get UCI_SVN environment variable
49-%
50-% Usage:
51-% UCI_SVN=ucisvn()
52-
53-if ~ispc,
54- UCI_SVN =getenv('UCI_SVN');
55-else
56- UCI_SVN =getenv('UCI_SVN_WIN');
57-end
58-
59-if (isempty(UCI_SVN)),
60- error('ucisvn error message: ''UCI_SVN'' environment variable is empty! You should define UCI_SVN in your .cshrc or .bashrc');
61-end
62Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/shell/issmdir.m
63===================================================================
64--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/shell/issmdir.m (revision 12998)
65+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/shell/issmdir.m (revision 12999)
66@@ -1,18 +0,0 @@
67-function ISSM_DIR=issmdir()
68-%ISSMDIR - Get ISSM_DIR environment variable
69-%
70-% Usage:
71-% ISSM_DIR=issmdir()
72-
73-if ~ispc,
74- ISSM_DIR =getenv('ISSM_DIR');
75-else
76- ISSM_DIR =getenv('ISSM_DIR_WIN');
77- if strcmpi(ISSM_DIR(end),'/') | strcmpi(ISSM_DIR(end),'\'),
78- ISSM_DIR = ISSM_DIR(1:end-1); %shave off the last '/'
79- end
80-end
81-
82-if (isempty(ISSM_DIR)),
83- error('issmdir error message: ''ISSM_DIR'' environment variable is empty! You should define ISSM_DIR in your .cshrc or .bashrc!');
84-end
85Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/shell/jplsvn.m
86===================================================================
87--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/shell/jplsvn.m (revision 12998)
88+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/shell/jplsvn.m (revision 12999)
89@@ -1,15 +0,0 @@
90-function JPL_SVN=jplsvn()
91-%ISSMDIR - Get JPL_SVN environment variable
92-%
93-% Usage:
94-% JPL_SVN=jplsvn()
95-
96-if ~ispc,
97- JPL_SVN =getenv('JPL_SVN');
98-else
99- JPL_SVN =getenv('JPL_SVN_WIN');
100-end
101-
102-if (isempty(JPL_SVN)),
103- error('jplsvn error message: ''JPL_SVN'' environment variable is empty! You should define JPL_SVN in your .cshrc or .bashrc');
104-end
105Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/os/flaimdir.m
106===================================================================
107--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/os/flaimdir.m (revision 0)
108+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/os/flaimdir.m (revision 12999)
109@@ -0,0 +1,7 @@
110+function FLAIM_DIR=flaimdir()
111+%ISSMDIR - Get FLAIM installation directory
112+%
113+% Usage:
114+% FLAIM_DIR=flaimdir()
115+
116+FLAIM_DIR=[issmdir '/externalpackages/flaim/install'];
117Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/os/issmdir.py
118===================================================================
119--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/os/issmdir.py (revision 0)
120+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/os/issmdir.py (revision 12999)
121@@ -0,0 +1,24 @@
122+import platform
123+import os
124+from MatlabFuncs import *
125+
126+def issmdir():
127+ """
128+ ISSMDIR - Get ISSM_DIR environment variable
129+
130+ Usage:
131+ ISSM_DIR=issmdir()
132+ """
133+
134+ if not 'Windows' in platform.system():
135+ ISSM_DIR =os.environ['ISSM_DIR']
136+ else:
137+ ISSM_DIR =os.environ['ISSM_DIR_WIN']
138+ if strcmpi(ISSM_DIR[-1],'/') or strcmpi(ISSM_DIR[-1],'\\'):
139+ ISSM_DIR = ISSM_DIR[:-1] #shave off the last '/'
140+
141+ if not ISSM_DIR:
142+ raise RuntimeError("issmdir error message: 'ISSM_DIR' environment variable is empty! You should define ISSM_DIR in your .cshrc or .bashrc!")
143+
144+ return ISSM_DIR
145+
146Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/os/ucisvn.m
147===================================================================
148--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/os/ucisvn.m (revision 0)
149+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/os/ucisvn.m (revision 12999)
150@@ -0,0 +1,15 @@
151+function UCI_SVN=ucisvn()
152+%ISSMDIR - Get UCI_SVN environment variable
153+%
154+% Usage:
155+% UCI_SVN=ucisvn()
156+
157+if ~ispc,
158+ UCI_SVN =getenv('UCI_SVN');
159+else
160+ UCI_SVN =getenv('UCI_SVN_WIN');
161+end
162+
163+if (isempty(UCI_SVN)),
164+ error('ucisvn error message: ''UCI_SVN'' environment variable is empty! You should define UCI_SVN in your .cshrc or .bashrc');
165+end
166Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/os/issmdir.m
167===================================================================
168--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/os/issmdir.m (revision 0)
169+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/os/issmdir.m (revision 12999)
170@@ -0,0 +1,18 @@
171+function ISSM_DIR=issmdir()
172+%ISSMDIR - Get ISSM_DIR environment variable
173+%
174+% Usage:
175+% ISSM_DIR=issmdir()
176+
177+if ~ispc,
178+ ISSM_DIR =getenv('ISSM_DIR');
179+else
180+ ISSM_DIR =getenv('ISSM_DIR_WIN');
181+ if strcmpi(ISSM_DIR(end),'/') | strcmpi(ISSM_DIR(end),'\'),
182+ ISSM_DIR = ISSM_DIR(1:end-1); %shave off the last '/'
183+ end
184+end
185+
186+if (isempty(ISSM_DIR)),
187+ error('issmdir error message: ''ISSM_DIR'' environment variable is empty! You should define ISSM_DIR in your .cshrc or .bashrc!');
188+end
189Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/os/jplsvn.m
190===================================================================
191--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/os/jplsvn.m (revision 0)
192+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/os/jplsvn.m (revision 12999)
193@@ -0,0 +1,15 @@
194+function JPL_SVN=jplsvn()
195+%ISSMDIR - Get JPL_SVN environment variable
196+%
197+% Usage:
198+% JPL_SVN=jplsvn()
199+
200+if ~ispc,
201+ JPL_SVN =getenv('JPL_SVN');
202+else
203+ JPL_SVN =getenv('JPL_SVN_WIN');
204+end
205+
206+if (isempty(JPL_SVN)),
207+ error('jplsvn error message: ''JPL_SVN'' environment variable is empty! You should define JPL_SVN in your .cshrc or .bashrc');
208+end
209Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/os/shell
210===================================================================
211--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/os/shell (revision 12998)
212+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/os/shell (revision 12999)
213
214Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/os/shell
215___________________________________________________________________
216Added: svn:ignore
217## -0,0 +1,2 ##
218+Makefile.in
219+Makefile
Note: See TracBrowser for help on using the repository browser.