Changeset 3452

Timestamp:

04/08/10 08:05:09 (15 years ago)

Author:

seroussi

Message:

added CreateConstraints for Balancedvelocities, Balancedthickness and Prognostic

Location:

issm/trunk/src/c/ModelProcessorx

Files:

• Balancedthickness/CreateConstraintsBalancedthickness.cpp (modified) (2 diffs)
• Balancedvelocities/CreateConstraintsBalancedvelocities.cpp (modified) (3 diffs)
• Prognostic/CreateConstraintsPrognostic.cpp (modified) (4 diffs)

issm/trunk/src/c/ModelProcessorx/Balancedthickness/CreateConstraintsBalancedthickness.cpp

@@ -10 +10 @@
 #include "../IoModel.h"
 
-
 void    CreateConstraintsBalancedthickness(DataSet** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
-
 
         int i;
@@ -24 +22 @@
         IoModelFetchData(&iomodel->spcthickness,NULL,NULL,iomodel_handle,"spcthickness");
 
-        count=1;
+        count=1; //matlab indexing
         /*Create spcs from x,y,z, as well as the spc values on those spcs: */
         for (i=0;i<iomodel->numberofvertices;i++){

issm/trunk/src/c/ModelProcessorx/Balancedvelocities/CreateConstraintsBalancedvelocities.cpp

@@ -10 +10 @@
 #include "../IoModel.h"
 
-
 void    CreateConstraintsBalancedvelocities(DataSet** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
 
-
         int i;
-        int count;
+        int count=1;
         
         DataSet* constraints = NULL;
@@ -21 +19 @@
 
         /*spc intermediary data: */
-        int spc_sid;
-        int spc_node;
-        int spc_dof;
-        double spc_value;
-        
         double* spcvelocity=NULL;
         
@@ -34 +27 @@
         IoModelFetchData(&spcvelocity,NULL,NULL,iomodel_handle,"spcvelocity");
 
-        count=0;
-
+        count=1; //matlab indexing
         /*Create spcs from x,y,z, as well as the spc values on those spcs: */
         for (i=0;i<iomodel->numberofvertices;i++){
-        #ifdef _PARALLEL_
-        /*keep only this partition's nodes:*/
-        if((iomodel->my_vertices[i]==1)){
-        #endif
+                /*keep only this partition's nodes:*/
+                if((iomodel->my_vertices[i]==1)){
 
-                if ((int)spcvelocity[6*i+0] && (int)spcvelocity[6*i+1]){ //spc if vx and vy are constrained
-        
-                        /*This grid needs to be spc'd: */
-                        spc_sid=count;
-                        spc_node=i+1;
-                        spc_dof=1; //we enforce first translation degree of freedom, for temperature
-                        spc_value=pow( pow(*(spcvelocity+6*i+4),2.0) + pow(*(spcvelocity+6*i+5),2.0) ,0.5);
+                        if ((int)spcvelocity[6*i+0] && (int)spcvelocity[6*i+1]){ //spc if vx and vy are constrained
 
-                        spc = new Spc(spc_sid,spc_node,spc_dof,spc_value);
-                        constraints->AddObject(spc);
-                        count++;
-                }
+                                /*This grid needs to be spc'd: */
+                                constraints->AddObject(new Spc(count,i+1,1,pow( pow(*(spcvelocity+6*i+4),2.0) + pow(*(spcvelocity+6*i+5),2.0) ,0.5)));
+                                count++;
+                        }
 
-        #ifdef _PARALLEL_
-        } //if((my_vertices[i]==1))
-        #endif
+                } //if((my_vertices[i]==1))
         }
 

issm/trunk/src/c/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp

@@ -2 +2 @@
  * CreateConstraintsPrognostic.c:
  */
-
 
 #include "../../DataSet/DataSet.h"
@@ -11 +10 @@
 #include "../IoModel.h"
 
-
 void    CreateConstraintsPrognostic(DataSet** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
 
-
         int i;
-        int count;
+        int count=0;
         
         DataSet* constraints = NULL;
@@ -22 +19 @@
 
         /*spc intermediary data: */
-        int spc_sid;
-        int spc_node;
-        int spc_dof;
-        double spc_value;
-        
         double* spcthickness=NULL;
         
@@ -35 +27 @@
         IoModelFetchData(&spcthickness,NULL,NULL,iomodel_handle,"spcthickness");
 
-        count=0;
-
+        count=1;//matlab indexing
         /*Create spcs from x,y,z, as well as the spc values on those spcs: */
         for (i=0;i<iomodel->numberofvertices;i++){
-        #ifdef _PARALLEL_
-        /*keep only this partition's nodes:*/
-        if((iomodel->my_vertices[i]==1)){
-        #endif
+                /*keep only this partition's nodes:*/
+                if((iomodel->my_vertices[i]==1)){
 
-                if ((int)spcthickness[2*i]){
-        
-                        /*This grid needs to be spc'd: */
+                        if ((int)spcthickness[2*i]){
 
-                        spc_sid=count;
-                        spc_node=i+1;
-                        spc_dof=1; //we enforce first translation degree of freedom, for temperature
-                        spc_value=*(spcthickness+2*i+1);
+                                constraints->AddObject(new Spc(count,i+1,1,*(spcthickness+2*i+1)));
+                                count++;
+                        }
 
-                        spc = new Spc(spc_sid,spc_node,spc_dof,spc_value);
-                        constraints->AddObject(spc);
-                        count++;
-                }
-
-        #ifdef _PARALLEL_
-        } //if((my_vertices[i]==1))
-        #endif
+                } //if((my_vertices[i]==1))
         }