Changeset 8430

Timestamp:

05/25/11 17:23:14 (14 years ago)

Author:

Mathieu Morlighem

Message:

merged the transients 2D and 3D

Location:

issm/trunk/src/m

Files:

• enum/EnumToModelField.m (modified) (1 diff)
• enum/Transient2DAnalysisEnum.m (deleted)
• enum/Transient2DSolutionEnum.m (deleted)
• enum/Transient3DAnalysisEnum.m (deleted)
• enum/Transient3DSolutionEnum.m (deleted)
• enum/TransientSolutionEnum.m (added)
• model/ismodelselfconsistent.m (modified) (2 diffs)
• model/isresultconsistent.m (modified) (1 diff)
• model/plot/plot_transient_field.m (modified) (1 diff)
• model/plot/plot_transient_movie.m (modified) (1 diff)
• model/process_solve_options.m (modified) (1 diff)
• model/solve.m (modified) (1 diff)
• model/tres.m (modified) (1 diff)
• solutions/CorePointerFromSolutionEnum.m (modified) (1 diff)
• solutions/SolutionConfiguration.m (modified) (1 diff)
• solutions/transient_core.m (added)

issm/trunk/src/m/enum/EnumToModelField.m

@@ -21 +21 @@
                 case VyObsEnum(), string='vy_obs'; return
                 case GroundingLineMigrationEnum(), string='gl_migration'; return
-                case BasalMeltingRateEnum(), string='basal_melting_rate'; return
-      case SurfaceAccumulationRateEnum(), string='surface_accumulation_rate'; return
-                case SurfaceAblationRateEnum(), string='surface_ablation_rate'; return
-                case SurfaceMassBalanceEnum(), string='surface_mass_balance'; return
+                case BasalMeltingRateEnum: string='basal_melting_rate'; return
+      case SurfaceAccumulationRateEnum: string='surface_accumulation_rate'; return
+                case SurfaceAblationRateEnum: string='surface_ablation_rate'; return
+                case SurfaceMassBalanceEnum: string='surface_mass_balance'; return
                 otherwise, error(['Enum ' num2str(enum)  ' not found associated to any model field']);
 

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -268 +268 @@
 %Solution specific check
 %TRANSIENT {{{1
-if (md.solution_type==Transient2DSolutionEnum | md.solution_type==Transient3DSolutionEnum),
+if (md.solution_type==TransientSolutionEnum),
 
         if md.dt<=0,
@@ -484 +484 @@
                         %EXTRUSION
                         if (md.dim==2),
-                                error(['model not consistent: for a ' md.solution_type ' computation, the model must be 3d, extrude it first!'])
+                                if md.solution_type==TransientSolutionEnum,
+                                        return;
+                                else
+                                        error(['model not consistent: for a ' EnumToString(md.solution_type) ' computation, the model must be 3d, extrude it first!'])
+                                end
                         end
 

issm/trunk/src/m/model/isresultconsistent.m

@@ -154 +154 @@
 end
 
-if (solution_type==Transient2DSolutionEnum() | solution_type==Transient3DSolutionEnum()),
+if (solution_type==TransientSolutionEnum()),
 
         for iter=1:length(md.results.TransientAnalysis)

issm/trunk/src/m/model/plot/plot_transient_field.m

@@ -8 +8 @@
 
 %Check that they are transient results
-if (~isfield(md.results,'Transient2DSolution') && ~isfield(md.results,'Transient3DSolution')),
+if (~isfield(md.results,'TransientSolution')),
         error('plot_transient_field error message: no transient results in the model');
 end
 
-if md.dim==2,
-        transient=md.results.Transient2DSolution;
-else
-        transient=md.results.Transient3DSolution;
-end
-
 %Figure out the iterations to plot and check if it is possible
+transient=md.results.TransientSolution;
 maxiteration=size(transient,2);
 steps=getfieldvalue(options,'steps',1:1:maxiteration);

issm/trunk/src/m/model/plot/plot_transient_movie.m

@@ -16 +16 @@
         end
 
-        if md.dim==2,
-                results=md.results.Transient2DSolution;
-        else
-                results=md.results.Transient3DSolution;
-        end
-
         %loop over the time steps
+        results=md.results.TransientSolution;
         for i=1:length(results)
 

issm/trunk/src/m/model/process_solve_options.m

@@ -11 +11 @@
 if ischar(solution_type), error(['only Enums are supported as ''solution_type''. For example: md=solve(md,''solution_type'',DiagnosticSolutionEnum); ']); end
 if ~ismember(solution_type,[DiagnosticSolutionEnum,PrognosticSolutionEnum,ThermalSolutionEnum,...
-                SteadystateSolutionEnum,ParametersSolutionEnum,Transient2DSolutionEnum,Transient3DSolutionEnum...
+                SteadystateSolutionEnum,ParametersSolutionEnum,TransientSolutionEnum,...
                 BalancethicknessSolutionEnum,BalancevelocitiesSolutionEnum,BedSlopeSolutionEnum,SurfaceSlopeSolutionEnum,GroundingLineMigration2DSolutionEnum,HydrologySolutionEnum,FlaimSolutionEnum]),
         error(['process_solve_options error message: solution_type ' EnumToString(solution_type) ' not supported yet!']);

issm/trunk/src/m/model/solve.m

@@ -12 +12 @@
 %               SteadystateSolutionEnum
 %               ParametersSolutionEnum
-%               Transient2DSolutionEnum
-%               Transient3DSolutionEnum...
+%               TransientSolutionEnum...
 %               BalancethicknessSolutionEnum
 %               BalancevelocitiesSolutionEnum

issm/trunk/src/m/model/tres.m

@@ -53 +53 @@
 
 elseif strcmpi(string,'transient'),
-        results=md.results.Transient2DSolution;
+        results=md.results.TransientSolution;
         results2.Vel=NaN;
         count=1;
         for i=1:length(results),
-                if ~isempty(md.results.Transient2DSolution(i).Vel),
-                        results2(count).Vel=PatchToVec(md.results.Transient2DSolution(i).Vel);
-                        results2(count).Surface=PatchToVec(md.results.Transient2DSolution(i).Surface);
-                        results2(count).Thickness=PatchToVec(md.results.Transient2DSolution(i).Thickness);
-                        results2(count).Bed=PatchToVec(md.results.Transient2DSolution(i).Bed);
-                        results2(count).Vx=PatchToVec(md.results.Transient2DSolution(i).Vx);
-                        results2(count).Vy=PatchToVec(md.results.Transient2DSolution(i).Vy);
-                        results2(count).time=md.results.Transient2DSolution(i).time;
-                        results2(count).step=md.results.Transient2DSolution(i).step;
+                if ~isempty(md.results.TransientSolution(i).Vel),
+                        results2(count).Vel=PatchToVec(md.results.TransientSolution(i).Vel);
+                        results2(count).Surface=PatchToVec(md.results.TransientSolution(i).Surface);
+                        results2(count).Thickness=PatchToVec(md.results.TransientSolution(i).Thickness);
+                        results2(count).Bed=PatchToVec(md.results.TransientSolution(i).Bed);
+                        results2(count).Vx=PatchToVec(md.results.TransientSolution(i).Vx);
+                        results2(count).Vy=PatchToVec(md.results.TransientSolution(i).Vy);
+                        results2(count).time=md.results.TransientSolution(i).time;
+                        results2(count).step=md.results.TransientSolution(i).step;
                         if md.gl_migration~=NoneEnum,
-                                results2(count).ElementOnIceShelf=md.results.Transient2DSolution(i).ElementOnIceShelf;
+                                results2(count).ElementOnIceShelf=md.results.TransientSolution(i).ElementOnIceShelf;
                         end
                         count=count+1;
                 end
         end
-        md.results.Transient2DSolution=results2;
+        md.results.TransientSolution=results2;
         clear results,results2;
 elseif strcmpi(string,'steadystate'),

issm/trunk/src/m/solutions/CorePointerFromSolutionEnum.m

@@ -15 +15 @@
         case SurfaceSlopeSolutionEnum,             solutioncore='surfaceslope_core';
         case BedSlopeSolutionEnum,                 solutioncore='bedslope_core';
-        case Transient2DSolutionEnum,              solutioncore='transient2d_core';
-        case Transient3DSolutionEnum,              solutioncore='transient3d_core';
+        case TransientSolutionEnum,                solutioncore='transient_core';
         case FlaimSolutionEnum,                    solutioncore='flaim_core';
         case GroundingLineMigration2DSolutionEnum, solutioncore='DUMMYDUMMY'; %not working in serial mode

issm/trunk/src/m/solutions/SolutionConfiguration.m

@@ -42 +42 @@
                 analyses=[BedSlopeAnalysisEnum];
 
-        case Transient2DSolutionEnum,
-                numanalyses=6; 
-                analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;PrognosticAnalysisEnum];
-
-        case Transient3DSolutionEnum,
+        case TransientSolutionEnum,
                 numanalyses=8; 
-                analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;PrognosticAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum];
+                analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum;PrognosticAnalysisEnum];
 
         case FlaimSolutionEnum,