Changeset 7686
- Timestamp:
- 03/24/11 14:54:33 (14 years ago)
- Location:
- issm/trunk/src/m/model
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/m/model/ismodelselfconsistent.m
r7629 r7686 288 288 %}}} 289 289 290 %FLAIM {{{1 291 if (md.solution_type == FlaimSolutionEnum), 292 if ~exist(md.fm_tracks,'file') 293 error(['model not consistent: fm_tracks file ''' md.fm_tracks ''' must exist.']); 294 end 295 % probably going to need some checks on fm_flightreqs here 296 if (numel(md.fm_criterion) ~= md.numberofgrids) && (numel(md.fm_criterion) ~= md.numberofelements) 297 error(['model not consistent: fm_criterion vector must have number of nodes (' int2str(md.numberofgrids) ') or elements (' int2str(md.numberofelements) ') values, not ' int2str(numel(md.fm_criterion)) ' values.']); 298 end 299 end 300 %}}} 301 290 302 %Solution specific check 291 303 %TRANSIENT {{{1 … … 474 486 end 475 487 %}}} 488 case FlaimAnalysisEnum, 489 % {{{2 490 % No checks for now 491 %}}} 476 492 otherwise 477 493 disp(['WARNING: no check implemented for analysis ' EnumToString(analysis_enum) '!']); -
issm/trunk/src/m/model/process_solve_options.m
r7646 r7686 22 22 if ~ismember(solution_type,[DiagnosticSolutionEnum,PrognosticSolutionEnum,ThermalSolutionEnum,... 23 23 SteadystateSolutionEnum,ParametersSolutionEnum,Transient2DSolutionEnum,Transient3DSolutionEnum... 24 BalancedthicknessSolutionEnum,BalancedvelocitiesSolutionEnum,BedSlopeSolutionEnum,SurfaceSlopeSolutionEnum,GroundingLineMigration2DSolutionEnum,HydrologySolutionEnum ]),24 BalancedthicknessSolutionEnum,BalancedvelocitiesSolutionEnum,BedSlopeSolutionEnum,SurfaceSlopeSolutionEnum,GroundingLineMigration2DSolutionEnum,HydrologySolutionEnum,FlaimSolutionEnum]), 25 25 error(['process_solve_options error message: solution_type ' EnumToString(solution_type) ' not supported yet!']); 26 26 end … … 38 38 outoptions.iparams=getfieldvalue(options,'iparams',1); 39 39 outoptions.runmpi=getfieldvalue(options,'runmpi',false); 40 41 % process flaim arguments 42 outoptions.fmdir=getfieldvalue(options,'fmdir',['fm' num2str(GetPId)]); 43 outoptions.fmfile=getfieldvalue(options,'fmfile','fm_targets'); 44 outoptions.overwrite=getfieldvalue(options,'overwrite','n'); 45 outoptions.keep=getfieldvalue(options,'keep','y'); 46 outoptions.latsgn=getfieldvalue(options,'latsgn',0); 47 outoptions.cmap=getfieldvalue(options,'cmap',[]); 48 -
issm/trunk/src/m/model/solve.m
r7629 r7686 35 35 assignin('base',inputname(1),md); 36 36 37 %flaim analysis 38 if (md.solution_type == FlaimSolutionEnum) 39 md=flaim(md,options); 40 md.solution_type=EnumToString(options.solution_type); 41 return; 42 end 43 37 44 %If running in parallel, we have a different way of launching the solution 38 45 %sequences.
Note:
See TracChangeset
for help on using the changeset viewer.