Changeset 1765

Timestamp:

08/18/09 15:56:41 (16 years ago)

Author:

seroussi

Message:

model processor thermal

Location:

issm/trunk/src/c/ModelProcessorx/Thermal

Files:

• CreateConstraintsThermal.cpp (modified) (5 diffs)
• CreateLoadsThermal.cpp (modified) (3 diffs)

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

@@ -29 +29 @@
         double spc_value;
         
-        double* dirichletvalues_thermal=NULL;
-        double* gridondirichlet_thermal=NULL;
+        double* spctemperature=NULL;
         
         /*Create constraints: */
@@ -36 +35 @@
 
         /*Fetch data: */
-        ModelFetchData((void**)&gridondirichlet_thermal,NULL,NULL,model_handle,"gridondirichlet_thermal","Matrix","Mat");
-        ModelFetchData((void**)&dirichletvalues_thermal,NULL,NULL,model_handle,"dirichletvalues_thermal","Matrix","Mat");
+        ModelFetchData((void**)&spctemperature,NULL,NULL,model_handle,"spctemperature","Matrix","Mat");
 
         count=0;
@@ -48 +46 @@
         #endif
 
-                if ((int)gridondirichlet_thermal[i]){
+                if ((int)spctemperature[2*i]){
         
                         /*This grid needs to be spc'd to vx_obs and vy_obs:*/
@@ -55 +53 @@
                         spc_node=i+1;
                         spc_dof=1; //we enforce first translation degree of freedom, for temperature
-                        spc_value=dirichletvalues_thermal[i];
+                        spc_value=spctemperature[2*i+1];
 
                         spc = new Spc(spc_sid,spc_node,spc_dof,spc_value);
@@ -75 +73 @@
         cleanup_and_return:
         /*Free data: */
-        xfree((void**)&gridondirichlet_thermal);
-        xfree((void**)&dirichletvalues_thermal);
+        xfree((void**)&spctemperature);
         
         /*Assign output pointer: */

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

@@ -47 +47 @@
 
         //create penalties for grids: no grid can have a temperature over the melting point
-        ModelFetchData((void**)&model->gridondirichlet_thermal,NULL,NULL,model_handle,"gridondirichlet_thermal","Matrix","Mat");
+        ModelFetchData((void**)&model->spctemperature,NULL,NULL,model_handle,"spctemperature","Matrix","Mat");
 
         for (i=0;i<model->numberofnodes;i++){
@@ -55 +55 @@
         #endif
 
-                if (!model->gridondirichlet_thermal[i]){ //No penalty applied on spc grids!
+                if (!model->spctemperature[2*i]){ //No penalty applied on spc grids!
                 
                         pengrid_id=count+1; //matlab indexing
@@ -73 +73 @@
         #endif
         }
-        xfree((void**)&model->gridondirichlet_thermal);
+        xfree((void**)&model->spctemperature);
 
         /*All our datasets are already order by ids. Set presort flag so that later on, when sorting is requested on these