Changeset 13255

Timestamp:

09/04/12 17:49:35 (13 years ago)

Author:

Eric.Larour

Message:

CHG: ADOLC not needed in these files.

Location:

issm/trunk-jpl/src/c

Files:

• classes/bamg/Geometry.cpp (modified) (1 diff)
• modules/Bamgx/Bamgx.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/bamg/Geometry.cpp

@@ -183 +183 @@
                         if(verbose>5) _printLine_("      processing hVertices");
                         for (i=0;i< nbv;i++){
-                                if (!xIsNan<IssmDouble>(bamgopts->hVertices[i])){
+                                if (!xIsNan<IssmPDouble>(bamgopts->hVertices[i])){
                                         vertices[i].m=Metric((double)bamgopts->hVertices[i]);
                                 }

issm/trunk-jpl/src/c/modules/Bamgx/Bamgx.cpp

@@ -119 +119 @@
                         if (verbosity>1) _printLine_("   Merging Metric with hVertices...");
                         for (i=0;i<BTh.nbv;i++){
-                                if (!xIsNan<IssmDouble>(bamgopts->hVertices[i])){
+                                if (!xIsNan<IssmPDouble>(bamgopts->hVertices[i])){
                                         BTh[i].m=Metric((float)bamgopts->hVertices[i]);
                                 }
@@ -129 +129 @@
                         if (verbosity>1) _printLine_("   Merging Metric with hminVertices...");
                         for (i=0;i<BTh.nbv;i++){
-                                if (!xIsNan<IssmDouble>(bamgopts->hminVertices[i])){
+                                if (!xIsNan<IssmPDouble>(bamgopts->hminVertices[i])){
                                         Metric M=BTh.vertices[i].m;
                                         EigenMetric Vp(M/coef);
@@ -142 +142 @@
                         if (verbosity>1) _printLine_("   Merging Metric with hmaxVertices...");
                         for (i=0;i<BTh.nbv;i++){
-                                if (!xIsNan<IssmDouble>(bamgopts->hmaxVertices[i])){
+                                if (!xIsNan<IssmPDouble>(bamgopts->hmaxVertices[i])){
                                         Metric M=BTh.vertices[i].m;
                                         EigenMetric Vp(M/coef);