Changeset 9639

Timestamp:

09/07/11 07:24:09 (14 years ago)

Author:

Mathieu Morlighem

Message:

minor fixes

Location:

issm/trunk/src

Files:

• c/objects/Elements/Tria.cpp (modified) (1 diff)
• m/model/ismodelselfconsistent.m (modified) (1 diff)
• m/solutions/transient_core.m (modified) (1 diff)

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -1614 +1614 @@
                                                 velocity_mag    =sqrt(pow(vx,   2.)+pow(vy,   2.))+epsvel;
                                                 obs_velocity_mag=sqrt(pow(vxobs,2.)+pow(vyobs,2.))+epsvel;
-                                                printf("-------------- file: Tria.cpp line: %i\n",__LINE__); 
-                                                printf("%g %g\n",velocity_mag,obs_velocity_mag);
                                                 scale=-8*pow(meanvel,2.)/pow(velocity_mag,2.)*log(velocity_mag/obs_velocity_mag);
-                                                printf("%g\n",meanvel);
                                                 dux=scale*vx;
                                                 duy=scale*vy;
-                                                printf("%g %g %g\n",vx,vy,scale);
                                                 pe->values[i*NDOF2+0]+=dux*weight*Jdet*gauss->weight*basis[i]; 
                                                 pe->values[i*NDOF2+1]+=duy*weight*Jdet*gauss->weight*basis[i]; 

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

@@ -209 +209 @@
                 message(['model not consistent: model ' md.miscellaneous.name ' control_type field should be a cell of strings']);
         end
-        if ~ismember(md.control_type,{'Dhdt' 'DragCoefficient' 'RheologyBbar' 'Vx' 'Vy'});
-                message(['model not consistent: model ' md.miscellaneous.name ' control_type field should be ''Dhdt'' ''DragCoefficient'' ''RheologyBbar'' ''Vx'' ''Vy''']);
+        if ~ismember(md.control_type,{'Dhdt' 'FrictionCoefficient' 'RheologyBbar' 'Vx' 'Vy'});
+                message(['model not consistent: model ' md.miscellaneous.name ' control_type field should be ''Dhdt'' ''FrictionCoefficient'' ''RheologyBbar'' ''Vx'' ''Vy''']);
         end
 

issm/trunk/src/m/solutions/transient_core.m

@@ -27 +27 @@
                 %Increment
                 if(time_adapt),
-                        dt=TimesteppingTimeAdapt(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
+                        dt=TimeAdapt(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
                         if(time+dt>ndt), dt=ndt-time; end
                         femmodel.parameters.Dt=dt;