Changeset 468

Timestamp:

05/18/09 10:30:09 (15 years ago)

Author:

Eric.Larour

Message:

Added sub_analysis_type

Location:

issm/trunk/src/c/objects

Files:

• Pengrid.cpp (modified) (1 diff)
• Penta.cpp (modified) (4 diffs)

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

@@ -233 +233 @@
 #undef __FUNCT__ 
 #define __FUNCT__ "Pengrid::PenaltyCreatePVector"
-void  Pengrid::PenaltyCreatePVector(Vec pg,void* inputs,double kmax,int analysis_type){
+void  Pengrid::PenaltyCreatePVector(Vec pg,void* inputs,double kmax,int analysis_type,int sub_analysis_type){
 
         /*No penalty applied, do nothing: */

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

@@ -1112 +1112 @@
                  * and compute Du*/
                 tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria (lower face).
-                tria->Du(du_g,u_g,u_g_obs,inputs,analysis_type);
+                tria->Du(du_g,u_g,u_g_obs,inputs,analysis_type,sub_analysis_type);
                 delete tria;
                 return;
@@ -1119 +1119 @@
                 
                 tria=(Tria*)SpawnTria(3,4,5); //grids 3, 4 and 5 make the new tria (upper face).
-                tria->Du(du_g,u_g,u_g_obs,inputs,analysis_type);
+                tria->Du(du_g,u_g,u_g_obs,inputs,analysis_type,sub_analysis_type);
                 delete tria;
                 return;
@@ -1182 +1182 @@
                  * and compute Misfit*/
                 tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria (lower face).
-                J=tria->Misfit( velocity,obs_velocity,inputs,analysis_type);
+                J=tria->Misfit( velocity,obs_velocity,inputs,analysis_type,sub_analysis_type);
                 delete tria;
                 return J;
@@ -1189 +1189 @@
 
                 tria=(Tria*)SpawnTria(3,4,5); //grids 3, 4 and 5 make the new tria (upper face).
-                J=tria->Misfit( velocity,obs_velocity,inputs,analysis_type);
+                J=tria->Misfit( velocity,obs_velocity,inputs,analysis_type,sub_analysis_type);
                 delete tria;
                 return J;