Changeset 3450

Timestamp:

04/08/10 07:57:36 (15 years ago)

Author:

seroussi

Message:

added CreateConstraints for Thermal

Location:

issm/trunk/src/c/ModelProcessorx

Files:

• Melting/CreateLoadsMelting.cpp (modified) (1 diff)
• Thermal/CreateConstraintsThermal.cpp (modified) (3 diffs)
• Thermal/CreateLoadsThermal.cpp (modified) (1 diff)

issm/trunk/src/c/ModelProcessorx/Melting/CreateLoadsMelting.cpp

@@ -34 +34 @@
         IoModelFetchData(&iomodel->gridonbed,NULL,NULL,iomodel_handle,"gridonbed");
 
+        count=1; //matlab indexing
         for (i=0;i<iomodel->numberofvertices;i++){
                 /*keep only this partition's nodes:*/

issm/trunk/src/c/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp

@@ -10 +10 @@
 #include "../IoModel.h"
 
-
 void    CreateConstraintsThermal(DataSet** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
 
-
         int i;
-        int count;
+        int count=0;
         
         DataSet* constraints = NULL;
         Spc*    spc  = NULL;
 
-        /*spc intermediary data: */
-        int spc_sid;
-        int spc_node;
-        int spc_dof;
-        double spc_value;
-        
         double* spctemperature=NULL;
         
@@ -37 +29 @@
         IoModelFetchData(&spctemperature,NULL,NULL,iomodel_handle,"spctemperature");
 
-        count=0;
+        count=1;
 
         /*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)spctemperature[2*i]){
-        
-                        /*This grid needs to be spc'd to vx_obs and vy_obs:*/
+                        if ((int)spctemperature[2*i]){
 
-                        spc_sid=count;
-                        spc_node=i+1;
-                        spc_dof=1; //we enforce first translation degree of freedom, for temperature
-                        spc_value=spctemperature[2*i+1];
+                                constraints->AddObject(new Spc(count,i+1,1,spctemperature[2*i+1]));
+                                count++;
 
-                        spc = new Spc(spc_sid,spc_node,spc_dof,spc_value);
-                        constraints->AddObject(spc);
-                        count++;
+                        }
 
-                }
-
-        #ifdef _PARALLEL_
-        } //if((my_grids[i]==1))
-        #endif
+                } //if((my_grids[i]==1))
         }
 
@@ -70 +50 @@
         constraints->Presort();
 
-        
         cleanup_and_return:
         /*Free data: */

issm/trunk/src/c/ModelProcessorx/Thermal/CreateLoadsThermal.cpp

@@ -32 +32 @@
         IoModelFetchData(&iomodel->spctemperature,NULL,NULL,iomodel_handle,"spctemperature");
 
+        count=1; //matlab indexing
         for (i=0;i<iomodel->numberofvertices;i++){
                 /*keep only this partition's nodes:*/