Changeset 17790
- Timestamp:
- 04/21/14 15:33:50 (11 years ago)
- Location:
- issm/trunk-jpl/src/m/solve
- Files:
-
- 2 deleted
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified issm/trunk-jpl/src/m/solve/solve.m ¶
r17782 r17790 11 11 % - ThermalSolutionEnum 12 12 % - SteadystateSolutionEnum 13 % - TransientSolutionEnum ...13 % - TransientSolutionEnum 14 14 % - BalancethicknessSolutionEnum 15 15 % - BedSlopeSolutionEnum … … 26 26 27 27 %recover and process solve options 28 options=pairoptions(varargin{:},'solution_type',solutionenum); 29 options=process_solve_options(options); 28 if ~strncmp(fliplr(EnumToString(solutionenum)),fliplr('Solution'),8), 29 error(['solutionenum ' EnumToString(solutionenum) ' not supported!']); 30 end 31 options=pairoptions(varargin{:},'solutionenum',solutionenum); 30 32 31 33 %recover some fields 32 md.private.solution= options.solution_type;34 md.private.solution=solutionenum; 33 35 cluster=md.cluster; 34 36 … … 49 51 50 52 %First, build a runtime name that is unique 51 if options.runtimename,53 if getfieldvalue(options,'runtimename',true), 52 54 c=clock; 53 55 md.private.runtimename=sprintf('%s-%02i-%02i-%04i-%02i-%02i-%02i-%i',md.miscellaneous.name,c(2),c(3),c(1),c(4),c(5),floor(c(6)),feature('GetPid')); … … 62 64 end 63 65 64 %flaim analysis 65 if (options.solution_type == FlaimSolutionEnum()) 66 %flaim analysis (To be removed?) 67 if (solutionenum == FlaimSolutionEnum()) 68 %fmdir = getfieldvalue(options,'fmdir',['fm' num2str(feature('GetPid'))]); 69 %overwrite = getfieldvalue(options,'overwrite','n'); 70 %keep = getfieldvalue(options,'keep','y'); 71 %latsgn = getfieldvalue(options,'latsgn',0); 72 %cmap = getfieldvalue(options,'cmap',[]); 66 73 md=flaim_sol(md,options); 67 md.private.solution=EnumToString( options.solution_type);74 md.private.solution=EnumToString(solutionenum); 68 75 return; 69 76 end 70 77 71 78 %Do we load results only? 72 if options.loadonly,79 if getfieldvalue(options,'loadonly',false), 73 80 md=loadresultsfromcluster(md); 74 81 return; … … 81 88 82 89 %Stop here if batch mode 83 if strcmpi( options.batch,'yes')90 if strcmpi(getfieldvalue(options,'batch','no'),'yes') 84 91 if md.verbose.solution, 85 92 disp('batch mode requested: not launching job interactively'); -
TabularUnified issm/trunk-jpl/src/m/solve/solve.py ¶
r17782 r17790 25 25 - ThermalSolutionEnum 26 26 - SteadystateSolutionEnum 27 - TransientSolutionEnum ...27 - TransientSolutionEnum 28 28 - BalancethicknessSolutionEnum 29 29 - BedSlopeSolutionEnum … … 40 40 41 41 #recover and process solve options 42 options=pairoptions('solution_type',solutionenum,*args) 43 options=process_solve_options(options) 42 if EnumToString(solutionenum)[0][-8:] != 'Solution': 43 raise ValueError("solutionenum '%s' not supported!" % EnumToString(solutionenum)[0]) 44 options=pairoptions('solutionenum',solutionenum,*args) 44 45 45 46 #recover some fields 46 md.private.solution= options['solution_type']47 md.private.solution=solutionenum 47 48 cluster=md.cluster 48 49 … … 68 69 69 70 #flaim analysis 70 if options['solution_type']== FlaimSolutionEnum():71 if solutionenum == FlaimSolutionEnum(): 71 72 md=flaim_sol(md,options) 72 [md.private.solution]=EnumToString( options['solution_type'])73 [md.private.solution]=EnumToString(solutionenum) 73 74 return md 74 75 75 76 #Do we load results only? 76 if options ['loadonly']:77 if options.getfieldvalue('loadonly',False): 77 78 md=loadresultsfromcluster(md) 78 79 return md … … 84 85 85 86 #Stop here if batch mode 86 if m.strcmpi(options ['batch'],'yes'):87 if m.strcmpi(options.getfieldvalue('batch','no'),'yes'): 87 88 print 'batch mode requested: not launching job interactively' 88 89 print 'launch solution sequence on remote cluster by hand' … … 112 113 113 114 return md 114
Note:
See TracChangeset
for help on using the changeset viewer.