Changeset 8430
- Timestamp:
- 05/25/11 17:23:14 (14 years ago)
- Location:
- issm/trunk/src/m
- Files:
-
- 2 added
- 4 deleted
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/m/enum/EnumToModelField.m
r8399 r8430 21 21 case VyObsEnum(), string='vy_obs'; return 22 22 case GroundingLineMigrationEnum(), string='gl_migration'; return 23 case BasalMeltingRateEnum (),string='basal_melting_rate'; return24 case SurfaceAccumulationRateEnum (),string='surface_accumulation_rate'; return25 case SurfaceAblationRateEnum (),string='surface_ablation_rate'; return26 case SurfaceMassBalanceEnum (),string='surface_mass_balance'; return23 case BasalMeltingRateEnum: string='basal_melting_rate'; return 24 case SurfaceAccumulationRateEnum: string='surface_accumulation_rate'; return 25 case SurfaceAblationRateEnum: string='surface_ablation_rate'; return 26 case SurfaceMassBalanceEnum: string='surface_mass_balance'; return 27 27 otherwise, error(['Enum ' num2str(enum) ' not found associated to any model field']); 28 28 -
issm/trunk/src/m/model/ismodelselfconsistent.m
r8421 r8430 268 268 %Solution specific check 269 269 %TRANSIENT {{{1 270 if (md.solution_type==Transient 2DSolutionEnum | md.solution_type==Transient3DSolutionEnum),270 if (md.solution_type==TransientSolutionEnum), 271 271 272 272 if md.dt<=0, … … 484 484 %EXTRUSION 485 485 if (md.dim==2), 486 error(['model not consistent: for a ' md.solution_type ' computation, the model must be 3d, extrude it first!']) 486 if md.solution_type==TransientSolutionEnum, 487 return; 488 else 489 error(['model not consistent: for a ' EnumToString(md.solution_type) ' computation, the model must be 3d, extrude it first!']) 490 end 487 491 end 488 492 -
issm/trunk/src/m/model/isresultconsistent.m
r8298 r8430 154 154 end 155 155 156 if (solution_type==Transient 2DSolutionEnum() | solution_type==Transient3DSolutionEnum()),156 if (solution_type==TransientSolutionEnum()), 157 157 158 158 for iter=1:length(md.results.TransientAnalysis) -
issm/trunk/src/m/model/plot/plot_transient_field.m
r6134 r8430 8 8 9 9 %Check that they are transient results 10 if (~isfield(md.results,'Transient 2DSolution') && ~isfield(md.results,'Transient3DSolution')),10 if (~isfield(md.results,'TransientSolution')), 11 11 error('plot_transient_field error message: no transient results in the model'); 12 12 end 13 13 14 if md.dim==2,15 transient=md.results.Transient2DSolution;16 else17 transient=md.results.Transient3DSolution;18 end19 20 14 %Figure out the iterations to plot and check if it is possible 15 transient=md.results.TransientSolution; 21 16 maxiteration=size(transient,2); 22 17 steps=getfieldvalue(options,'steps',1:1:maxiteration); -
issm/trunk/src/m/model/plot/plot_transient_movie.m
r6815 r8430 16 16 end 17 17 18 if md.dim==2,19 results=md.results.Transient2DSolution;20 else21 results=md.results.Transient3DSolution;22 end23 24 18 %loop over the time steps 19 results=md.results.TransientSolution; 25 20 for i=1:length(results) 26 21 -
issm/trunk/src/m/model/process_solve_options.m
r8296 r8430 11 11 if ischar(solution_type), error(['only Enums are supported as ''solution_type''. For example: md=solve(md,''solution_type'',DiagnosticSolutionEnum); ']); end 12 12 if ~ismember(solution_type,[DiagnosticSolutionEnum,PrognosticSolutionEnum,ThermalSolutionEnum,... 13 SteadystateSolutionEnum,ParametersSolutionEnum,Transient 2DSolutionEnum,Transient3DSolutionEnum...13 SteadystateSolutionEnum,ParametersSolutionEnum,TransientSolutionEnum,... 14 14 BalancethicknessSolutionEnum,BalancevelocitiesSolutionEnum,BedSlopeSolutionEnum,SurfaceSlopeSolutionEnum,GroundingLineMigration2DSolutionEnum,HydrologySolutionEnum,FlaimSolutionEnum]), 15 15 error(['process_solve_options error message: solution_type ' EnumToString(solution_type) ' not supported yet!']); -
issm/trunk/src/m/model/solve.m
r8343 r8430 12 12 % SteadystateSolutionEnum 13 13 % ParametersSolutionEnum 14 % Transient2DSolutionEnum 15 % Transient3DSolutionEnum... 14 % TransientSolutionEnum... 16 15 % BalancethicknessSolutionEnum 17 16 % BalancevelocitiesSolutionEnum -
issm/trunk/src/m/model/tres.m
r8392 r8430 53 53 54 54 elseif strcmpi(string,'transient'), 55 results=md.results.Transient 2DSolution;55 results=md.results.TransientSolution; 56 56 results2.Vel=NaN; 57 57 count=1; 58 58 for i=1:length(results), 59 if ~isempty(md.results.Transient 2DSolution(i).Vel),60 results2(count).Vel=PatchToVec(md.results.Transient 2DSolution(i).Vel);61 results2(count).Surface=PatchToVec(md.results.Transient 2DSolution(i).Surface);62 results2(count).Thickness=PatchToVec(md.results.Transient 2DSolution(i).Thickness);63 results2(count).Bed=PatchToVec(md.results.Transient 2DSolution(i).Bed);64 results2(count).Vx=PatchToVec(md.results.Transient 2DSolution(i).Vx);65 results2(count).Vy=PatchToVec(md.results.Transient 2DSolution(i).Vy);66 results2(count).time=md.results.Transient 2DSolution(i).time;67 results2(count).step=md.results.Transient 2DSolution(i).step;59 if ~isempty(md.results.TransientSolution(i).Vel), 60 results2(count).Vel=PatchToVec(md.results.TransientSolution(i).Vel); 61 results2(count).Surface=PatchToVec(md.results.TransientSolution(i).Surface); 62 results2(count).Thickness=PatchToVec(md.results.TransientSolution(i).Thickness); 63 results2(count).Bed=PatchToVec(md.results.TransientSolution(i).Bed); 64 results2(count).Vx=PatchToVec(md.results.TransientSolution(i).Vx); 65 results2(count).Vy=PatchToVec(md.results.TransientSolution(i).Vy); 66 results2(count).time=md.results.TransientSolution(i).time; 67 results2(count).step=md.results.TransientSolution(i).step; 68 68 if md.gl_migration~=NoneEnum, 69 results2(count).ElementOnIceShelf=md.results.Transient 2DSolution(i).ElementOnIceShelf;69 results2(count).ElementOnIceShelf=md.results.TransientSolution(i).ElementOnIceShelf; 70 70 end 71 71 count=count+1; 72 72 end 73 73 end 74 md.results.Transient 2DSolution=results2;74 md.results.TransientSolution=results2; 75 75 clear results,results2; 76 76 elseif strcmpi(string,'steadystate'), -
issm/trunk/src/m/solutions/CorePointerFromSolutionEnum.m
r8353 r8430 15 15 case SurfaceSlopeSolutionEnum, solutioncore='surfaceslope_core'; 16 16 case BedSlopeSolutionEnum, solutioncore='bedslope_core'; 17 case Transient2DSolutionEnum, solutioncore='transient2d_core'; 18 case Transient3DSolutionEnum, solutioncore='transient3d_core'; 17 case TransientSolutionEnum, solutioncore='transient_core'; 19 18 case FlaimSolutionEnum, solutioncore='flaim_core'; 20 19 case GroundingLineMigration2DSolutionEnum, solutioncore='DUMMYDUMMY'; %not working in serial mode -
issm/trunk/src/m/solutions/SolutionConfiguration.m
r8353 r8430 42 42 analyses=[BedSlopeAnalysisEnum]; 43 43 44 case Transient2DSolutionEnum, 45 numanalyses=6; 46 analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;PrognosticAnalysisEnum]; 47 48 case Transient3DSolutionEnum, 44 case TransientSolutionEnum, 49 45 numanalyses=8; 50 analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum; PrognosticAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum];46 analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum;PrognosticAnalysisEnum]; 51 47 52 48 case FlaimSolutionEnum,
Note:
See TracChangeset
for help on using the changeset viewer.