Changeset 20323
- Timestamp:
- 03/18/16 12:44:22 (9 years ago)
- Location:
- issm/trunk-jpl
- Files:
-
- 2 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/m4/issm_options.m4
r20293 r20323 1397 1397 MKLINCL="" 1398 1398 if test x$VENDOR = xintel-pleiades; then 1399 MKLLIB="-Wl,-rpath,/nasa/intel/Compiler/2015.0.090/composer_xe_2015.0.090/mkl/lib/intel64 -L/nasa/intel/Compiler/2015.0.090/composer_xe_2015.0.090/mkl/lib/intel64-lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm"1399 MKLLIB="-Wl,-rpath,$MKL_ROOT -L/$MKL_ROOT -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm" 1400 1400 elif test x$VENDOR = xintel-discover; then 1401 MKLLIB=-L"$MKL_ROOT -lmkl_intel_lp64 -lmkl_ intel_thread -lmkl_core -liomp5 -lpthread"1401 MKLLIB=-L"$MKL_ROOT -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -L/usr/lib64/ -lpthread -lm" 1402 1402 elif test x$VENDOR = xintel-acenet; then 1403 1403 MKLLIB=-L"$MKL_ROOT -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm" -
issm/trunk-jpl/src/m/classes/clusters/discover.m
r20320 r20323 94 94 if(isgprof), disp('gprof not supported by cluster, ignoring...'); end 95 95 96 executable='issm.exe'; 97 if isdakota, 98 version=IssmConfig('_DAKOTA_VERSION_'); version=str2num(version(1:3)); 99 if (version>=6), 100 executable='issm_dakota.exe'; 101 end 102 end 103 96 104 %write queuing script 97 105 fid=fopen([modelname '.queue'],'w'); … … 121 129 fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,dirname); 122 130 123 fprintf(fid,'mpirun -np %i %s/ issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);131 fprintf(fid,'mpirun -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname); 124 132 if ~io_gather, %concatenate the output files: 125 133 fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname); … … 131 139 fid=fopen([modelname '.run'],'w'); 132 140 if ~isvalgrind, 133 fprintf(fid,'mpirun -np %i %s/ issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);141 fprintf(fid,'mpirun -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname); 134 142 else 135 fprintf(fid,'mpirun -np %i valgrind --leak-check=full %s/ issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),[cluster.executionpath '/' dirname],modelname);143 fprintf(fid,'mpirun -np %i valgrind --leak-check=full %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,EnumToString(solution),[cluster.executionpath '/' dirname],modelname); 136 144 end 137 145 if ~io_gather, %concatenate the output files:
Note:
See TracChangeset
for help on using the changeset viewer.