Changeset 17325 for issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

Timestamp:

02/20/14 14:54:13 (11 years ago)

Author:

seroussi

Message:

CHG: updating no penetration condition for FS at each time step

File:

• issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

@@ -7 +7 @@
 #include "../cores/cores.h"
 
-//#define FSANALYTICAL 1
+//#define FSANALYTICAL 3
 
 /*Model processing*/
@@ -413 +413 @@
                                 _error_("not supported yet");
                         }
-                        for(i=0;i<iomodel->numberofvertices;i++){
-                                if(iomodel->my_vertices[i]){
-                                        if(nodeonbed[i]>0. && groundedice_ls[i]>0. && nodeonFS[i]>0.){
-                                                if(vertices_type[i] == FSApproximationEnum){
-                                                        for(j=0;j<Nz;j++) spcvz[i*Nz+j] = 0.;
-                                                }
-                                                else{
-                                                        _error_("not supported");
-                                                }
-                                        }
-                                }
-                        }
                         if(iomodel->meshtype==Mesh3DEnum){
                                 IoModelToConstraintsx(constraints,iomodel,StressbalanceSpcvxEnum,StressbalanceAnalysisEnum,finiteelement,1);