Changeset 7318

Timestamp:

02/03/11 16:23:24 (14 years ago)

Author:

Eric.Larour

Message:

grounding line migration solution related changes

Location:

issm/trunk/src/m/model

Files:

• ismodelselfconsistent.m (modified) (2 diffs)
• marshall.m (modified) (1 diff)
• process_solve_options.m (modified) (1 diff)

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

@@ -116 +116 @@
         error('dim should be either 2 3');
 end
-checkvalues(md,{'pressureload(:,end)'},[WaterEnum() AirEnum()]);
+checkvalues(md,{'pressureload(:,end)'},[WaterEnum() AirEnum() IceEnum()]);
 %}}}
 %NO NAN {{{1
 fields={'numberofelements','numberofgrids','x','y','z','drag_coefficient','drag_type','drag_p','drag_q',...
         'rho_ice','rho_water','rheology_B','elementoniceshelf','surface','thickness','bed','g','lowmem','sparsity','nsteps','maxiter',...
-        'tolx','eps_res','max_nonlinear_iterations','rheology_n','gridonbed','gridonsurface','elementonbed','elementonsurface','deltaH','DeltaH','timeacc','timedec','elementconnectivity'};
+        'tolx','eps_res','max_nonlinear_iterations','rheology_n','gridonbed','gridonsurface','elementonbed','elementonsurface','deltaH','DeltaH','timeacc','timedec','elementconnectivity','hemisphere'};
 checknan(md,fields);
 %}}}}
@@ -152 +152 @@
         error(['model not consistent: model ' md.name ' violates the equality thickness=surface-bed!']);
 end
-if md.gl_migration & isnan(md.bathymetry),
-        error(['model not consistent: model ' md.name ' requesting grounding line migration, buth bathymetry is absent!']);
+%GROUNDING LINE MIGRATION {{{1
+checkvalues(md,{'gl_migration'},[NoneEnum() AgressiveMigrationEnum() SoftMigrationEnum()]);
+if (md.gl_migration~=NoneEnum),
+        if isnan(md.bathymetry),
+                error(['model not consistent: model ' md.name ' requesting grounding line migration, buth bathymetry is absent!']);
+        end
 end
 

issm/trunk/src/m/model/marshall.m

@@ -163 +163 @@
 %grounding line migration: 
 WriteData(fid,md.gl_migration,'Integer','gl_migration');
-if(md.gl_migration),
+if(md.gl_migration~=NoneEnum),
         WriteData(fid,md.bathymetry,'Mat','bathymetry');
 end

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

@@ -26 +26 @@
 if ~ismember(analysis_type,[DiagnosticSolutionEnum,PrognosticSolutionEnum,ThermalSolutionEnum,...
                 SteadystateSolutionEnum,ParametersSolutionEnum,Transient2DSolutionEnum,Transient3DSolutionEnum...
-                BalancedthicknessSolutionEnum,BalancedvelocitiesSolutionEnum,BedSlopeSolutionEnum,SurfaceSlopeSolutionEnum]),
+                BalancedthicknessSolutionEnum,BalancedvelocitiesSolutionEnum,BedSlopeSolutionEnum,SurfaceSlopeSolutionEnum,GroundingLineMigration2DSolutionEnum]),
         error(['process_solve_options error message: analysis_type ' EnumToString(analysis_type) ' not supported yet!']);
 end