Changeset 13170
- Timestamp:
- 08/28/12 10:57:47 (13 years ago)
- Location:
- issm/trunk-jpl/src/m
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/m/classes/clusters/generic.m
r13123 r13170 62 62 63 63 %write queuing script 64 if ~ispc ,64 if ~ispc(), 65 65 66 66 fid=fopen([modelname '.queue'],'w'); … … 113 113 114 114 %write queuing script 115 if ~ispc ,115 if ~ispc(), 116 116 117 117 fid=fopen([modelname '.queue'],'w'); … … 178 178 function Download(cluster,dirname,filelist)% {{{ 179 179 180 if ispc ,180 if ispc(), 181 181 %do nothing 182 182 return; -
issm/trunk-jpl/src/m/classes/clusters/generic.py
r13043 r13170 2 2 import os 3 3 import math 4 import platform5 4 import subprocess 6 5 from EnumToString import EnumToString … … 10 9 from issmscpin import * 11 10 from issmscpout import * 11 from MatlabFuncs import * 12 12 13 13 class generic(object): … … 74 74 75 75 #write queuing script 76 if 'Windows' not in platform.system():76 if not ispc(): 77 77 78 78 fid=open(modelname+'.queue','w') … … 116 116 117 117 #write queuing script 118 if 'Windows' not in platform.system():118 if not ispc(): 119 119 120 120 fid=open(modelname+'.queue','w') … … 176 176 def Download(self,dirname,filelist): # {{{ 177 177 178 if 'Windows' in platform.system():178 if ispc(): 179 179 #do nothing 180 180 return -
issm/trunk-jpl/src/m/contrib/bamg/YamsCall.m
r13012 r13170 73 73 %call yams 74 74 fprintf('%s\n',' call Yams...'); 75 if ispc 75 if ispc() 76 76 %windows 77 77 system(['yams2-win -O 1 -v -0 -ecp -hgrad ' num2str(gradation) ' carre0 carre1']); -
issm/trunk-jpl/src/m/contrib/gslib/pkriging.m
r13010 r13170 45 45 delete([name '.outbin']); 46 46 delete([name '.bin']); 47 if ~ispc ,47 if ~ispc(), 48 48 delete([name '.tar.gz']); 49 49 end -
issm/trunk-jpl/src/m/miscellaneous/MatlabFuncs.py
r13007 r13170 3 3 4 4 return socket.gethostname().lower().split('.')[0] 5 6 def ispc(): 7 import platform 8 9 if 'Windows' in platform.system(): 10 return True 11 else: 12 return False 5 13 6 14 def strcmp(s1,s2): -
issm/trunk-jpl/src/m/os/issmdir.m
r12999 r13170 5 5 % ISSM_DIR=issmdir() 6 6 7 if ~ispc ,7 if ~ispc(), 8 8 ISSM_DIR =getenv('ISSM_DIR'); 9 9 else -
issm/trunk-jpl/src/m/os/issmdir.py
r13023 r13170 1 import platform2 1 import os 3 2 from MatlabFuncs import * … … 11 10 """ 12 11 13 if 'Windows' not in platform.system():12 if not ispc(): 14 13 ISSM_DIR =os.environ['ISSM_DIR'] 15 14 else: -
issm/trunk-jpl/src/m/os/issmscpin.m
r13071 r13170 29 29 else 30 30 31 if ispc ,31 if ispc(), 32 32 %use the putty project pscp.exe: it should be in the path. 33 33 -
issm/trunk-jpl/src/m/os/issmscpin.py
r13097 r13170 1 1 import socket 2 import platform3 2 import subprocess 4 3 import os … … 35 34 else: 36 35 37 if 'Windows' in platform.system():36 if ispc(): 38 37 #use the putty project pscp.exe: it should be in the path. 39 38 -
issm/trunk-jpl/src/m/os/issmscpout.m
r13071 r13170 20 20 end 21 21 else 22 if ispc ,22 if ispc(), 23 23 %use the putty project pscp.exe: it should be in the path. 24 24 -
issm/trunk-jpl/src/m/os/issmscpout.py
r13071 r13170 1 1 import socket 2 import platform3 2 import subprocess 4 3 import os … … 28 27 os.chdir(here) 29 28 else: 30 if 'Windows' in platform.system():29 if ispc(): 31 30 #use the putty project pscp.exe: it should be in the path. 32 31 -
issm/trunk-jpl/src/m/os/issmssh.m
r12743 r13170 12 12 system(command); 13 13 else 14 if ispc ,14 if ispc(), 15 15 %use the putty project plink.exe: it should be in the path. 16 16 -
issm/trunk-jpl/src/m/os/issmssh.py
r12944 r13170 1 1 import socket 2 import platform3 2 import subprocess 4 3 import os … … 20 19 subprocess.call(command,shell=True) 21 20 else: 22 if 'Windows' in platform.system():21 if ispc(): 23 22 #use the putty project plink.exe: it should be in the path. 24 23 -
issm/trunk-jpl/src/m/os/jplsvn.m
r12999 r13170 5 5 % JPL_SVN=jplsvn() 6 6 7 if ~ispc ,7 if ~ispc(), 8 8 JPL_SVN =getenv('JPL_SVN'); 9 9 else -
issm/trunk-jpl/src/m/os/oshostname.m
r11543 r13170 6 6 % 7 7 8 if ispc ,8 if ispc(), 9 9 [status,hostname]=system('hostname | sed ''s/-//g''');hostname=hostname(1:end-1); 10 10 -
issm/trunk-jpl/src/m/solve/loadresultsfromcluster.m
r13004 r13170 38 38 delete([md.miscellaneous.name '.errlog']); 39 39 delete([md.miscellaneous.name '.outbin']); 40 if ~ispc ,40 if ~ispc(), 41 41 delete([md.private.runtimename '.tar.gz']); 42 42 end … … 52 52 delete([md.miscellaneous.name '.bin']); 53 53 delete([md.miscellaneous.name '.petsc']); 54 if ~ispc ,54 if ~ispc(), 55 55 delete([md.miscellaneous.name '.queue']); 56 56 else -
issm/trunk-jpl/src/m/solve/loadresultsfromcluster.py
r13097 r13170 1 1 import os 2 import platform3 2 import socket 4 3 from MatlabFuncs import * … … 42 41 os.remove(md.miscellaneous.name+'.errlog') 43 42 os.remove(md.miscellaneous.name+'.outbin') 44 if 'Windows' not in platform.system():43 if not ispc(): 45 44 os.remove(md.private.runtimename+'.tar.gz') 46 45 … … 54 53 os.remove(md.miscellaneous.name+'.bin') 55 54 os.remove(md.miscellaneous.name+'.petsc') 56 if 'Windows' not in platform.system():55 if not ispc(): 57 56 os.remove(md.miscellaneous.name+'.queue') 58 57 else:
Note:
See TracChangeset
for help on using the changeset viewer.