spns #19079 apply topo-ii-vol sha 9db88dd to tag 1.3.0

diff --git a/products/patches/topo2volmesh-1.3.0-00001.patch b/products/patches/topo2volmesh-1.3.0-00001.patch
new file mode 100644 (file)
index 0000000..53cbd6f
--- /dev/null
+++ b/products/patches/topo2volmesh-1.3.0-00001.patch
@@ -0,0 +1,70 @@
+diff --git a/src/lib/TopiiVolPartitionPointCloudAlgo.h b/src/lib/TopiiVolPartitionPointCloudAlgo.h
+index 501fb60..4aa4734 100644
+--- a/src/lib/TopiiVolPartitionPointCloudAlgo.h
++++ b/src/lib/TopiiVolPartitionPointCloudAlgo.h
+@@ -53,7 +53,7 @@ double tst = MPI_Wtime();
+ //---- opening files -----
+ //====================================================================================//
+ 
+-snprintf (pathString, sizeof(pathString), "%s", inpurfile);
++snprintf (pathString, sizeof(pathString), "%s", inputfile);
+ 
+ readFile = fopen(pathString,"r");
+ 
+diff --git a/src/par-mesher/topIIvol_ParMesher.cpp b/src/par-mesher/topIIvol_ParMesher.cpp
+index 4978c49..09a1be8 100644
+--- a/src/par-mesher/topIIvol_ParMesher.cpp
++++ b/src/par-mesher/topIIvol_ParMesher.cpp
+@@ -148,8 +148,8 @@ int main(int argc, char *argv[])
+     int pnty = 29  ;
+     int pntz = 100 ;
+ 
+-    char inpurfile[80] = "./../../data/DEM_160m.xyz" ;
+-    char outpufile[80] = "Tetra-ParTop2Vol.mesh"     ;
++    char inputfile[] = "./../../data/DEM_160m.xyz" ;
++    char outputfile[] = "Tetra-ParTop2Vol.mesh"     ;
+ 
+ //====================================================================================//
+ //---- Comandline Parameters -----
+@@ -170,10 +170,10 @@ int main(int argc, char *argv[])
+                 pntz = atoi(argv[i+1]);
+ 
+             if (!strcmp(argv[i], "--in"))
+-                strcpy(inpurfile, argv[i+1]);
++                strcpy(inputfile, argv[i+1]);
+ 
+             if (!strcmp(argv[i], "--out"))
+-                strcpy(outpufile, argv[i+1]);
++                strcpy(outputfile, argv[i+1]);
+ 
+             if (!strcmp(argv[i], "--depth"))
+                 zmax= atol(argv[i+1]);
+@@ -240,7 +240,7 @@ if(ParallelPart == 1)
+ //-----------------------------------------------------------------------------------//
+ 
+     char strname[80]="";
+-    strcat (strname, inpurfile);
++    strcat (strname, inputfile);
+ 
+     MPI_File_open( MPI_COMM_WORLD, strname, 
+                    MPI_MODE_RDONLY,
+@@ -309,7 +309,7 @@ if(ParallelPart == 1)
+ //---- Name of partitioned mesh cloud -----
+ //====================================================================================//
+ 
+-    char partCloudName[80] = "pc_part";
++    char partCloudName[] = "pc_part";
+ 
+     MPI_Barrier(MPI_COMM_WORLD);
+ 
+@@ -437,8 +437,8 @@ if(ParallelPart == 1)
+ //---- open the file, and set the view -----
+ //====================================================================================//
+ 
+-    char str[80]="";
+-    strcat (str, outpufile);
++    char str[]="";
++    strcat (str, outputfile);
+ 
+     MPI_File_open(MPI_COMM_WORLD, str,
+                   MPI_MODE_CREATE|MPI_MODE_WRONLY,

diff --git a/products/topo2volmesh.pyconf b/products/topo2volmesh.pyconf
index 6bab1f5e8ed26e512f47fe796090f2b3795ad1e7..d941ef51a7e08eef22c37339c4ade8dcc99f6369 100644 (file)
--- a/products/topo2volmesh.pyconf
+++ b/products/topo2volmesh.pyconf
@@ -32,3 +32,8 @@ version_1_3_0:
 {
    compil_script : "topo2volmesh-1.3.0.sh"
 }
+
+version_1_3_0:
+{
+  patches : ['topo2volmesh-1.3.0-00001.patch']
+}
\ No newline at end of file