Changeset 16137 for issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/modules/ModelProcessorx (modified) (1 prop)
• src/c/modules/ModelProcessorx/Melting (modified) (1 prop)
• src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (modified) (2 diffs)

issm/trunk

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

issm/trunk/src/c

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

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

@@ -9 +9 @@
 void    CreateLoadsMelting(Loads** ploads, IoModel* iomodel){
 
-        /*Intermediary*/
-        int dim;
-        int numberofvertices;
-        iomodel->Constant(&dim,MeshDimensionEnum);
-        iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum);
-
         /*if 2d: Error*/
-        if (dim==2) _error_("2d meshes not supported yet");
+        if(iomodel->dim==2) _error_("2d meshes not supported yet");
 
         /*Recover pointer: */
         Loads* loads=*ploads;
 
-        /*Create loads if they do not exist yet*/
-        if(!loads) loads = new Loads();
-
         //create penalties for nodes: no node can have a temperature over the melting point
-        iomodel->FetchData(2,MeshVertexonbedEnum,MeshElementsEnum);
+        iomodel->FetchData(1,MeshVertexonbedEnum);
         CreateSingleNodeToElementConnectivity(iomodel);
 
-        for(int i=0;i<numberofvertices;i++){
+        for(int i=0;i<iomodel->numberofvertices;i++){
                 if((iomodel->my_vertices[i]==1)){
                         if (reCast<int>(iomodel->Data(MeshVertexonbedEnum)[i])){
@@ -35 +26 @@
                 }
         }
-        iomodel->DeleteData(2,MeshVertexonbedEnum,MeshElementsEnum);
+        iomodel->DeleteData(1,MeshVertexonbedEnum);
 
         /*Assign output pointer: */

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp