Changeset 17790


Ignore:
Timestamp:
04/21/14 15:33:50 (11 years ago)
Author:
Mathieu Morlighem
Message:

CHG: removed process_solve_options

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  
    1111%                - ThermalSolutionEnum
    1212%                - SteadystateSolutionEnum
    13 %                - TransientSolutionEnum...
     13%                - TransientSolutionEnum
    1414%                - BalancethicknessSolutionEnum
    1515%                - BedSlopeSolutionEnum
     
    2626
    2727%recover and process solve options
    28 options=pairoptions(varargin{:},'solution_type',solutionenum);
    29 options=process_solve_options(options);
     28if ~strncmp(fliplr(EnumToString(solutionenum)),fliplr('Solution'),8),
     29        error(['solutionenum ' EnumToString(solutionenum) ' not supported!']);
     30end
     31options=pairoptions(varargin{:},'solutionenum',solutionenum);
    3032
    3133%recover some fields
    32 md.private.solution=options.solution_type;
     34md.private.solution=solutionenum;
    3335cluster=md.cluster;
    3436
     
    4951
    5052%First, build a runtime name that is unique
    51 if options.runtimename,
     53if getfieldvalue(options,'runtimename',true),
    5254        c=clock;
    5355        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'));
     
    6264end
    6365
    64 %flaim analysis
    65 if (options.solution_type == FlaimSolutionEnum())
     66%flaim analysis (To be removed?)
     67if (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',[]);
    6673        md=flaim_sol(md,options);
    67         md.private.solution=EnumToString(options.solution_type);
     74        md.private.solution=EnumToString(solutionenum);
    6875        return;
    6976end
    7077
    7178%Do we load results only?
    72 if options.loadonly, 
     79if getfieldvalue(options,'loadonly',false),
    7380        md=loadresultsfromcluster(md);
    7481        return;
     
    8188
    8289%Stop here if batch mode
    83 if strcmpi(options.batch,'yes')
     90if strcmpi(getfieldvalue(options,'batch','no'),'yes')
    8491        if md.verbose.solution,
    8592                disp('batch mode requested: not launching job interactively');
  • TabularUnified issm/trunk-jpl/src/m/solve/solve.py

    r17782 r17790  
    2525              - ThermalSolutionEnum
    2626              - SteadystateSolutionEnum
    27               - TransientSolutionEnum...
     27              - TransientSolutionEnum
    2828              - BalancethicknessSolutionEnum
    2929              - BedSlopeSolutionEnum
     
    4040
    4141        #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)
    4445
    4546        #recover some fields
    46         md.private.solution=options['solution_type']
     47        md.private.solution=solutionenum
    4748        cluster=md.cluster
    4849
     
    6869
    6970        #flaim analysis
    70         if options['solution_type'] == FlaimSolutionEnum():
     71        if solutionenum == FlaimSolutionEnum():
    7172                md=flaim_sol(md,options)
    72                 [md.private.solution]=EnumToString(options['solution_type'])
     73                [md.private.solution]=EnumToString(solutionenum)
    7374                return md
    7475
    7576        #Do we load results only?
    76         if options['loadonly']: 
     77        if options.getfieldvalue('loadonly',False):
    7778                md=loadresultsfromcluster(md)
    7879                return md
     
    8485
    8586        #Stop here if batch mode
    86         if m.strcmpi(options['batch'],'yes'):
     87        if m.strcmpi(options.getfieldvalue('batch','no'),'yes'):
    8788                print 'batch mode requested: not launching job interactively'
    8889                print 'launch solution sequence on remote cluster by hand'
     
    112113
    113114        return md
    114 
Note: See TracChangeset for help on using the changeset viewer.