Changeset 3433

Timestamp:

04/07/10 16:22:18 (15 years ago)

Author:

Eric.Larour

Message:

Debug

Location:

issm/trunk/src/c/objects

Files:

• Riftfront.cpp (modified) (2 diffs)
• Riftfront.h (modified) (1 diff)

issm/trunk/src/c/objects/Riftfront.cpp

@@ -30 +30 @@
 Riftfront::Riftfront(char riftfront_type[RIFTFRONTSTRING],int riftfront_id, int riftfront_node_ids[MAX_RIFTFRONT_GRIDS], int riftfront_mparid, double riftfront_h[MAX_RIFTFRONT_GRIDS],double riftfront_b[MAX_RIFTFRONT_GRIDS],double riftfront_s[MAX_RIFTFRONT_GRIDS],double riftfront_normal[2],double riftfront_length,int riftfront_fill,double riftfront_friction, double riftfront_fraction,double riftfront_fractionincrement, double riftfront_penalty_offset, int riftfront_penalty_lock, bool riftfront_active,bool riftfront_frozen, int riftfront_counter,bool riftfront_prestable,bool riftfront_shelf){
 
-        this->Init(riftfront_type,riftfront_id, riftfront_node_ids[MAX_RIFTFRONT_GRIDS], riftfront_mparid, riftfront_h[MAX_RIFTFRONT_GRIDS],riftfront_b[MAX_RIFTFRONT_GRIDS],riftfront_s[MAX_RIFTFRONT_GRIDS],riftfront_normal[2],riftfront_length,riftfront_fill,riftfront_friction, riftfront_fraction,riftfront_fractionincrement, riftfront_penalty_offset, riftfront_penalty_lock, griftfront_active,griftfront_frozen, riftfront_counter,riftfront_prestable,riftfront_shelf);
+        this->Init(riftfront_type,riftfront_id, riftfront_node_ids, riftfront_mparid, riftfront_h,riftfront_b,riftfront_s,riftfront_normal,riftfront_length,riftfront_fill,riftfront_friction, riftfront_fraction,riftfront_fractionincrement, riftfront_penalty_offset, riftfront_penalty_lock, riftfront_active,riftfront_frozen, riftfront_counter,riftfront_prestable,riftfront_shelf);
 
 }
@@ -116 +116 @@
         riftfront_prestable=0;
                         
-        this->Init(riftfront_type,riftfront_id, riftfront_node_ids[MAX_RIFTFRONT_GRIDS], riftfront_mparid, riftfront_h[MAX_RIFTFRONT_GRIDS],riftfront_b[MAX_RIFTFRONT_GRIDS],riftfront_s[MAX_RIFTFRONT_GRIDS],riftfront_normal[2],riftfront_length,riftfront_fill,riftfront_friction, riftfront_fraction,riftfront_fractionincrement, riftfront_penalty_offset, riftfront_penalty_lock, griftfront_active,griftfront_frozen, riftfront_counter,riftfront_prestable,riftfront_shelf);
+        this->Init(riftfront_type,riftfront_id, riftfront_node_ids, riftfront_mparid, riftfront_h,riftfront_b,riftfront_s,riftfront_normal,riftfront_length,riftfront_fill,riftfront_friction, riftfront_fraction,riftfront_fractionincrement, riftfront_penalty_offset, riftfront_penalty_lock, riftfront_active,riftfront_frozen, riftfront_counter,riftfront_prestable,riftfront_shelf);
 
 }

issm/trunk/src/c/objects/Riftfront.h

@@ -62 +62 @@
                 void Init(char type[RIFTFRONTSTRING],int id, int node_ids[MAX_RIFTFRONT_GRIDS], int mparid, double h[MAX_RIFTFRONT_GRIDS],double b[MAX_RIFTFRONT_GRIDS],double s[MAX_RIFTFRONT_GRIDS],double normal[2],double length,int fill,double friction, double fraction, double fractionincrement, double penalty_offset, int penalty_lock,bool active,bool frozen, int counter,bool prestable,bool shelf);
                 Riftfront(char type[RIFTFRONTSTRING],int id, int node_ids[MAX_RIFTFRONT_GRIDS], int mparid, double h[MAX_RIFTFRONT_GRIDS],double b[MAX_RIFTFRONT_GRIDS],double s[MAX_RIFTFRONT_GRIDS],double normal[2],double length,int fill,double friction, double fraction, double fractionincrement, double penalty_offset, int penalty_lock,bool active,bool frozen, int counter,bool prestable,bool shelf);
+                Riftfront(int i, IoModel* iomodel);
                 ~Riftfront();
                 /*}}}*/