Changeset 15396 for issm/trunk/src/c/modules/Bamgx/Bamgx.cpp

Timestamp:

07/02/13 09:24:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 15394

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/modules/Bamgx/Bamgx.cpp (modified) (14 diffs)

issm/trunk

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

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

@@ -3 +3 @@
  */
 #include "./Bamgx.h"
-#include "../../classes/bamg/bamgobjects.h"
+#include "../../bamg/bamgobjects.h"
 #include "../../shared/shared.h"
-#include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 
@@ -41 +40 @@
 
                 //Step1: generate geometry Gh
-                if (verbosity>0) _printLine_("Construction of a mesh from a given geometry");
-                if (verbosity>1) _printLine_("   Processing geometry...");
+                if (verbosity>0) _printf_("Construction of a mesh from a given geometry\n");
+                if (verbosity>1) _printf_("   Processing geometry...\n");
                 Geometry Gh(bamggeom_in,bamgopts);
 
@@ -50 +49 @@
 
                 //build metric using geometry
-                if (verbosity>1) _printLine_("   Generating Metric...");
+                if (verbosity>1) _printf_("   Generating Metric...\n");
                 for(i=0;i<Gh.nbv;i++){
                         Metric M=Gh[i];
@@ -60 +59 @@
 
                 //generate mesh
-                if (verbosity>1) _printLine_("   Generating Mesh...");
+                if (verbosity>1) _printf_("   Generating Mesh...\n");
                 Mesh Th(maxnbv,Gh,bamgopts);
 
@@ -73 +72 @@
 
                 //Build output
-                if (verbosity>1) _printLine_("   Write Mesh...");
+                if (verbosity>1) _printf_("   Write Mesh...\n");
                 Th.WriteMesh(bamgmesh_out,bamgopts);
-                if (verbosity>1) _printLine_("   Write Geometry...");
+                if (verbosity>1) _printf_("   Write Geometry...\n");
                 Gh.WriteGeometry(bamggeom_out,bamgopts);
 
@@ -87 +86 @@
 
                 // read background mesh 
-                if (verbosity>0) _printLine_("Anisotropic mesh adaptation");
-                if (verbosity>1) _printLine_("   Processing initial mesh and geometry...");
+                if (verbosity>0) _printf_("Anisotropic mesh adaptation\n");
+                if (verbosity>1) _printf_("   Processing initial mesh and geometry...\n");
                 Mesh BTh(bamggeom_in,bamgmesh_in,bamgopts); 
 
@@ -100 +99 @@
                 //Generate initial metric
                 if (bamgopts->metric){
-                        if (verbosity>1) _printLine_("   Processing Metric...");
+                        if (verbosity>1) _printf_("   Processing Metric...\n");
                         BTh.ReadMetric(bamgopts);
                 }
                 else { 
-                        if (verbosity>1) _printLine_("   Generating initial Metric...");
+                        if (verbosity>1) _printf_("   Generating initial Metric...\n");
                         Metric Mhmax(bamgopts->hmax);
                         for (int iv=0;iv<BTh.nbv;iv++) BTh[iv].m = Mhmax;
@@ -111 +110 @@
                 //use present fields to generate metric if present
                 if (bamgopts->field){
-                        if (verbosity>1) _printLine_("   Merge metric with field provided...");
+                        if (verbosity>1) _printf_("   Merge metric with field provided...\n");
                         BTh.AddMetric(bamgopts);
                 }
@@ -117 +116 @@
                 // change using hVertices if provided
                 if(bamgopts->hVertices && bamgopts->hVerticesSize[0]==BTh.nbv){
-                        if (verbosity>1) _printLine_("   Merging Metric with hVertices...");
+                        if (verbosity>1) _printf_("   Merging Metric with hVertices...\n");
                         for (i=0;i<BTh.nbv;i++){
                                 if (!xIsNan<IssmPDouble>(bamgopts->hVertices[i])){
@@ -127 +126 @@
                 // change using hminVertices if provided
                 if (bamgopts->hminVertices){
-                        if (verbosity>1) _printLine_("   Merging Metric with hminVertices...");
+                        if (verbosity>1) _printf_("   Merging Metric with hminVertices...\n");
                         for (i=0;i<BTh.nbv;i++){
                                 if (!xIsNan<IssmPDouble>(bamgopts->hminVertices[i])){
@@ -140 +139 @@
                 // change using hmaxVertices if provided
                 if (bamgopts->hmaxVertices){
-                        if (verbosity>1) _printLine_("   Merging Metric with hmaxVertices...");
+                        if (verbosity>1) _printf_("   Merging Metric with hmaxVertices...\n");
                         for (i=0;i<BTh.nbv;i++){
                                 if (!xIsNan<IssmPDouble>(bamgopts->hmaxVertices[i])){
@@ -164 +163 @@
 
                 //Build new mesh
-                if (verbosity>1) _printLine_("   Generating Mesh...");
+                if (verbosity>1) _printf_("   Generating Mesh...\n");
                 Thr=&BTh,Thb=0;
                 Mesh & Th( *(0 ?  new Mesh(*Thr,&Thr->Gh,Thb,maxnbv) :  new Mesh(maxnbv,BTh,bamgopts,bamgopts->KeepVertices)));
@@ -185 +184 @@
                 if(verbosity>0) {
                         if (Th.nbt-Th.nbtout-Th.nbq*2){
-                                _printLine_("   new number of triangles = " << (Th.nbt-Th.nbtout-Th.nbq*2));
+                                _printf_("   new number of triangles = " << (Th.nbt-Th.nbtout-Th.nbq*2) << "\n");
                         }
                         if (Th.nbq ){
-                                _printLine_("   new number of quads = " << Th.nbq);
+                                _printf_("   new number of quads = " << Th.nbq << "\n");
                         }
                 }
 
                 //Build output
-                if (verbosity>1) _printLine_("   Write Mesh...");
+                if (verbosity>1) _printf_("   Write Mesh...\n");
                 Th.WriteMesh(bamgmesh_out,bamgopts);
-                if (verbosity>1) _printLine_("   Write Geometry...");
+                if (verbosity>1) _printf_("   Write Geometry...\n");
                 Th.Gh.WriteGeometry(bamggeom_out,bamgopts);
-                if (verbosity>1) _printLine_("   Write Metric...");
+                if (verbosity>1) _printf_("   Write Metric...\n");
                 BTh.WriteMetric(bamgopts);
 
@@ -207 +206 @@
 
         /*No error return*/
-        if (verbosity>1) _printLine_("   Exiting Bamg.");
+        if (verbosity>1) _printf_("   Exiting Bamg.\n");
         return noerr;
 

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache