File 0002-Remove-non-namespaced-endcod-function-dupl... of Package gmsh

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Remove-non-namespaced-endcod-function-duplicates-MMG.patch of Package gmsh (Revision 14bc6459876b2a14e4e271398ec22a68)

Currently displaying revision 14bc6459876b2a14e4e271398ec22a68 , Show latest

From c323dd099fca82cb32a8616071c600a00c930cb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Mon, 8 Jun 2020 02:15:33 +0200
Subject: [PATCH 2/3] Remove non-namespaced endcod function (duplicates
 MMG_endcod)

MMG_endcod is an identical definition in mmg3dlib.c, which also uses
the same global MMG_ctim/MMG_imprim variables. Defining the variables
twice is an ODR violation.
---
 contrib/mmg3d/build/sources/mmg3d.c | 32 -----------------------------
 1 file changed, 32 deletions(-)

diff --git a/contrib/mmg3d/build/sources/mmg3d.c b/contrib/mmg3d/build/sources/mmg3d.c
index 9e6ed7411..4096b3258 100644
--- a/contrib/mmg3d/build/sources/mmg3d.c
+++ b/contrib/mmg3d/build/sources/mmg3d.c
@@ -47,9 +47,6 @@ along with MMG3D. If not, see <http://www.gnu.org/licenses/>.
 #include "mesh.h"
 #include "eigenv.h"
 
-TIM_mytime         MMG_ctim[TIMEMAX];
-short	             MMG_imprim;
-
 unsigned char MMG_idir[4][3] = { {1,2,3}, {0,3,2}, {0,1,3}, {0,2,1} };
 unsigned char MMG_inxt[7]    = { 1,2,3,0,1,2,3 };
 unsigned char MMG_iarf[4][3] = { {5,4,3}, {5,1,2}, {4,2,0}, {3,0,1} };
@@ -382,35 +379,6 @@ int parsop(pMesh mesh) {
   return(1);
 }
 
-
-void endcod() {
-  double   ttot,ttim[TIMEMAX];
-  int      k,call[TIMEMAX];
-
-  TIM_chrono(OFF,&MMG_ctim[0]);
-
-  for (k=0; k<TIMEMAX; k++) {
-    call[k] = MMG_ctim[k].call;
-    ttim[k] = MMG_ctim[k].call ? TIM_gttime(MMG_ctim[k]) : 0.0;
-  }
-  ttot    = ttim[1]+ttim[2]+ttim[3]+ttim[4];
-  ttim[0] = M_MAX(ttim[0],ttot);
-
-  if ( abs(MMG_imprim) > 5 ) {
-    fprintf(stdout,"\n  -- CPU REQUIREMENTS\n");
-    fprintf(stdout,"  in/out    %8.2f %%    %3d. calls,   %7.2f sec/call\n",
-	    100.*ttim[1]/ttim[0],call[1],ttim[1]/(float)call[1]);
-    fprintf(stdout,"  analysis  %8.2f %%    %3d. calls,   %7.2f sec/call\n",
-	    100.*ttim[2]/ttim[0],call[2],ttim[2]/(float)call[2]);
-    fprintf(stdout,"  optim     %8.2f %%    %3d. calls,   %7.2f sec/call\n",
-	    100.*ttim[3]/ttim[0],call[3],ttim[3]/(float)call[3]);
-    fprintf(stdout,"  total     %8.2f %%    %3d. calls,   %7.2f sec/call\n",
-	    100.*ttot/ttim[0],call[0],ttot/(float)call[0]);
-  }
-  fprintf(stdout,"\n   ELAPSED TIME  %.2f SEC.  (%.2f)\n",ttim[0],ttot);
-}
-
-
 /* set function pointers */
 int MMG_setfunc(int type) {
   if ( type == 6 ) {
-- 
2.26.2

Places

File 0002-Remove-non-namespaced-endcod-function-duplicates-MMG.patch of Package gmsh (Revision 14bc6459876b2a14e4e271398ec22a68)

Places