Changeset 34

Timestamp:

04/24/09 11:16:15 (16 years ago)

Author:

Mathieu Morlighem

Message:

moved icediagnostic -> diagnostic (removed ice from the functions name)

Location:

issm/trunk/src/m/solutions/ice

Files:

• IceNormalizeconstraints.m (deleted)
• IcePenaltyConstraints.m (deleted)
• IceReducematrix.m (deleted)
• IceReducematrixfromgtof.m (deleted)
• IceReducerightside.m (deleted)
• Normalizeconstraints.m (added)
• PenaltyConstraints.m (added)
• Reducematrix.m (added)
• Reducematrixfromgtof.m (added)
• Reducerightside.m (added)
• diagnostic.m (modified) (3 diffs)
• diagnostic2d.m (added)
• diagnostic3d.m (added)
• diagnostic_core_linear.m (added)
• diagnostic_core_nonlinear.m (added)
• diagnostic_wrapper.m (deleted)
• huttercompute.m (modified) (2 diffs)
• icediagnostic.m (deleted)
• icediagnostic2d.m (deleted)
• icediagnostic3d.m (deleted)
• icediagnostic_core_linear.m (deleted)
• icediagnostic_core_nonlinear.m (deleted)
• icediagnostic_wrapper.m (deleted)
• icemelting_core.m (deleted)
• iceparameters.m (deleted)
• iceparameters_wrapper.m (deleted)
• iceprognostic.m (deleted)
• iceprognostic_core.m (deleted)
• iceprognostic_wrapper.m (deleted)
• icethermal.m (deleted)
• icethermal_core.m (deleted)
• icethermal_wrapper.m (deleted)
• icetransient.m (deleted)
• icetransient2d.m (deleted)
• icetransient3d.m (deleted)
• icetransient_wrapper.m (deleted)
• melting_core.m (added)
• parameters.m (added)
• prognostic.m (added)
• prognostic_core.m (added)
• slopecompute.m (modified) (2 diffs)
• thermal.m (added)
• thermal_core.m (added)
• transient.m (added)
• transient2d.m (added)
• transient3d.m (added)

issm/trunk/src/m/solutions/ice/diagnostic.m

@@ -1 @@
-function md=icediagnostic(md);
-%ICEDIAGNOSTIC - compute the velocity field of a model
+function md=diagnostic(md);
+%DIAGNOSTIC - compute the velocity field of a model
 %
 %   this routine is a Matlab drivn solution
 %   
 %   Usage:
-%      u_g=icediagnostic_core_linear(m,analysis_type,varargin);
+%      u_g=diagnostic_core_linear(m,analysis_type,varargin);
 %
 %   See also: ICEDIAGNOSTIC2D, ICEDIAGNOSTIC3D, ICEDIAGNOSTIC_CORE_NONLINEAR ICEDIAGNOSTIC_CORE_LINEAR
+
+%start timing
+t1=clock;
 
 %define global variables
 iceglobal
 
-%determine if run is parallel
-if strcmpi(md.cluster,'yes'), cluster=1; else cluster=0;end;
-
-%for now, only serial support is in
-if cluster,
-        error('icediagnostic error message: parallel support not implemented yet');
-end
-
-%Create fem structure (input of icediagnostic3d)
+%Create fem structure (input of diagnostic3d)
 fem=struct();
 %Figure out which type of elements are present
@@ -48 +43 @@
 
         %compute solution
-        u_g=icediagnostic2d(md,fem);
+        u_g=diagnostic2d(md,fem);
 
         %Load results onto model
@@ -83 +78 @@
 
         %compute solution
-        u_g=icediagnostic3d(md,fem);
+        u_g=diagnostic3d(md,fem);
 
         %Load results onto model
         md=Loadresults(md,fem,u_g);
 end
+
+%stop timing
+t2=clock;
+disp(sprintf('\n%s\n',['solution converged in ' num2str(etime(t2,t1)) ' seconds']));

issm/trunk/src/m/solutions/ice/huttercompute.m

@@ -7 +7 @@
 %define global variables
 iceglobal
-
-%determine if run is parallel
-if strcmpi(md.cluster,'yes'), cluster=1; else cluster=0;end;
-
-%for now, only serial support is in
-if cluster,
-        error('icediagnostic error message: parallel support not implemented yet');
-end
 
 %setup some parameters to be passed to the core solution
@@ -45 +37 @@
 slopesurface(2:6:gridset.gsize,1)=md.surface_slopey;
 disp(sprintf('\n%s',['computing Hutter''s velocities...']));
-u_g=icediagnostic_core_linear(elements,grids,materials,loads,params,ys,'diagnostic_hutter',struct('slopesurface',slopesurface));
+u_g=diagnostic_core_linear(elements,grids,materials,loads,params,ys,'diagnostic_hutter',struct('slopesurface',slopesurface));
         
 md.vx=u_g(1:6:end)*md.yts;

issm/trunk/src/m/solutions/ice/slopecompute.m

@@ -29 +29 @@
 
 if strcmpi(field, 'bed'),
-        slopex=icediagnostic_core_linear(m_bs,'bed_slope_compute_x');
-        slopey=icediagnostic_core_linear(m_bs,'bed_slope_compute_y');
+        slopex=diagnostic_core_linear(m_bs,'bed_slope_compute_x');
+        slopey=diagnostic_core_linear(m_bs,'bed_slope_compute_y');
         
         slopex=slopex(1:6:end);
@@ -44 +44 @@
         
 elseif strcmpi(field, 'surface'),
-        slopex=icediagnostic_core_linear(m_ss,'surface_slope_compute_x');
-        slopey=icediagnostic_core_linear(m_ss,'surface_slope_compute_y');
+        slopex=diagnostic_core_linear(m_ss,'surface_slope_compute_x');
+        slopey=diagnostic_core_linear(m_ss,'surface_slope_compute_y');
                 
         slopex=slopex(1:6:end);