Changeset 11093

Timestamp:

01/11/12 14:19:56 (13 years ago)

Author:

Eric.Larour

Message:

Windows adaptations for const integer dimensions of arrays and
use of floor routines.

Location:

issm/trunk-jpl/src/c/objects/Bamg

Files:

• BamgGeom.cpp (modified) (1 diff)
• BamgMesh.cpp (modified) (1 diff)
• Mesh.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/objects/Bamg/BamgGeom.cpp

@@ -57 +57 @@
         int         i;
         mxArray*    output=NULL;
-        int         numfields=7;
+        const int         numfields=7;
         const char* fnames[numfields];
         mwSize      ndim=2;

issm/trunk-jpl/src/c/objects/Bamg/BamgMesh.cpp

@@ -97 +97 @@
         int         i;
         mxArray*    output=NULL;
-        int         numfields=16;
+        const int         numfields=16;
         const char* fnames[numfields];
         mwSize      ndim=2;

issm/trunk-jpl/src/c/objects/Bamg/Mesh.cpp

@@ -863 +863 @@
                         for(j=head_1[i];j!=-1;j=next_1[j]){
                                 _assert_(connectivitymax_1*i+k < connectivitymax_1*nbv);
-                                bamgmesh->NodalElementConnectivity[connectivitymax_1*i+k]=floor(j/3)+1;
+                                bamgmesh->NodalElementConnectivity[connectivitymax_1*i+k]=floor((double)j/3)+1;
                                 k++;
                         }