Changeset 36

Timestamp:

04/24/09 13:45:12 (16 years ago)

Author:

Mathieu Morlighem

Message:

some fixing

Location:

issm/trunk/src/m/solutions/ice

Files:

• CreateFemModel.m (modified) (1 diff)
• diagnostic_core_linear.m (modified) (1 diff)
• diagnostic_core_nonlinear.m (modified) (2 diffs)
• melting_core.m (modified) (1 diff)
• prognostic_core.m (modified) (1 diff)
• thermal_core.m (modified) (2 diffs)

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

@@ -26 +26 @@
 %generate grid sets and reduce yg to ys from g-set to s-set.
 BuildGridSets(grids,constraints); ys=Reducevector_g(yg);
-        
-Gmn = IceNormalizeconstraints(Rmg);
+
+%buile Gmn
+Gmn=Normalizeconstraints(Rmg);
 
 %recover dof number

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

@@ -51 +51 @@
 % Reduce stiffness matrix from g set to f set (effectively rooting out the single point constraints), 
 % and compute modifications to loads from single point constraints.
-[K_ff K_fs]=IceReducematrixfromgtof(K_gg,G_mn); 
+[K_ff K_fs]=Reducematrixfromgtof(K_gg,G_mn); 
 
 % Reduce load from g set to f set
-p_f=IceReducerightside(p_g,G_mn,K_fs,ys);
+p_f=Reducerightside(p_g,G_mn,K_fs,ys);
 
 % Solve

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

@@ -99 +99 @@
         % and compute modifications to loads from single point constraints.
         
-        [K_ff K_fs]=IceReducematrixfromgtof(K_gg,G_mn); 
+        [K_ff K_fs]=Reducematrixfromgtof(K_gg,G_mn); 
 
         % Reduce load from g set to f set
-        p_f=IceReducerightside(p_g,G_mn,K_fs,ys);
+        p_f=Reducerightside(p_g,G_mn,K_fs,ys);
 
         % Solve
@@ -156 +156 @@
         [K_gg,p_g]=SystemMatrices(elements,grids,loads,materials,kflag, pflag, sparsity,inputs,analysis_type);
         [K_gg,p_g]=PenaltySystemMatrices(grids,loads,materials,kflag, pflag, sparsity,inputs,analysis_type,K_gg,p_g);
-        [K_ff K_fs]=IceReducematrixfromgtof(K_gg,G_mn); 
+        [K_ff K_fs]=Reducematrixfromgtof(K_gg,G_mn); 
         varargout(1)={K_ff};
         varargout(2)={K_fs};

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

@@ -44 +44 @@
 % Reduce stiffness matrix from g set to f set (effectively rooting out the single point constraints),
 % and compute modifications to loads from single point constraints.
-[K_ff K_fs]=IceReducematrixfromgtof(K_gg,G_mn); 
+[K_ff K_fs]=Reducematrixfromgtof(K_gg,G_mn); 
 
 % Reduce load from g set to f set
-p_f=IceReducerightside(p_g,G_mn,K_fs,ys);
+p_f=Reducerightside(p_g,G_mn,K_fs,ys);
 
 % Solve

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

@@ -47 +47 @@
 % Reduce stiffness matrix from g set to f set (effectively rooting out the single point constraints), 
 % and compute modifications to loads from single point constraints.
-[K_ff K_fs]=IceReducematrixfromgtof(K_gg,G_mn); 
+[K_ff K_fs]=Reducematrixfromgtof(K_gg,G_mn); 
 
 % Reduce load from g set to f set
-p_f=IceReducerightside(p_g,G_mn,K_fs,ys);
+p_f=Reducerightside(p_g,G_mn,K_fs,ys);
 
 % Solve

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

@@ -58 +58 @@
         % Reduce stiffness matrix from g set to f set (effectively rooting out the single point constraints),
         % and compute modifications to loads from single point constraints.
-        [K_ff K_fs]=IceReducematrixfromgtof(K_gg_penalized,G_mn); 
+        [K_ff K_fs]=Reducematrixfromgtof(K_gg_penalized,G_mn); 
 
         % Reduce load from g set to f set
-        p_f=IceReducerightside(p_g_penalized,G_mn,K_fs,ys);
+        p_f=Reducerightside(p_g_penalized,G_mn,K_fs,ys);
         
         % Solve
@@ -69 +69 @@
         t_g= Mergesolution_g(t_f,G_mn,ys); 
 
-        [loads,converged]=IcePenaltyConstraints(loads,grids,materials,params,struct('pressure',pressure, 'dt',dt, 'temperature',t_g));
+        [loads,converged]=PenaltyConstraints(loads,grids,materials,params,struct('pressure',pressure, 'dt',dt, 'temperature',t_g));
 
 end