From 7d8e549a918c490aa05b5a8a04a9181ab93a2f59 Mon Sep 17 00:00:00 2001
From: Ansgar Burchardt <Ansgar.Burchardt@tu-dresden.de>
Date: Wed, 5 Apr 2017 19:13:08 +0200
Subject: [PATCH] Remove `lppos` command
---
gm/ugm.cc | 153 -------------------------------------------------
ui/commands.cc | 28 ---------
2 files changed, 181 deletions(-)
diff --git a/gm/ugm.cc b/gm/ugm.cc
index f3b995c64..d27b8e459 100644
--- a/gm/ugm.cc
+++ b/gm/ugm.cc
@@ -11204,159 +11204,6 @@ INT NS_DIM_PREFIX Grid_CheckPeriodicity (GRID *grid)
return (GM_OK);
}
-char pbuf[256];
-
-static INT ListProclist (int *proclist)
-{
- while (*proclist != -1)
- {
- sprintf(pbuf+strlen(pbuf),"%4d-%d ",proclist[0],proclist[1]);
- proclist += 2;
- }
-
- return(GM_OK);
-}
-
-static INT ListPeriodicNodeAndVec (GRID *g, INT vgid)
-{
- VECTOR *v;
- NODE *n,*nref;
- int *proclist;
- INT found = 0;
-
- sprintf(pbuf," ");
- for (v=PFIRSTVECTOR(g); v!=NULL; v=SUCCVC(v))
- {
- if (vgid != GID(v)) continue;
- nref = (NODE*) VOBJECT(v);
- found++;
-
- /* sprintf(pbuf+strlen(pbuf),"v=" VINDEX_FMTX " ", VINDEX_PRTX(v)); */
- /* sprintf(pbuf+strlen(pbuf),"LEVEL %d v=%08x/%d ",GLEVEL(g), GID(v),PRIO(v)); */
-
- proclist = PROCLIST(v);
- /* ListProclist(proclist); */
- /* sprintf(pbuf+strlen(pbuf)," VNEW=%d ",VNEW(v)); */
- }
-
- for (n=PFIRSTNODE(g); n!=NULL; n=SUCCN(n))
- {
- DOUBLE *cv;
-
- if (vgid != GID(NVECTOR(n))) continue;
-
- cv = CVECT(MYVERTEX(n));
-
- #ifdef __TWODIM__
- sprintf(pbuf+strlen(pbuf),"LEVEL %d c %g %g ",GLEVEL(g),cv[0],cv[1]);
- #else
- sprintf(pbuf+strlen(pbuf),"c %g %g %g ",cv[0],cv[1],cv[2]);
- #endif
- sprintf(pbuf+strlen(pbuf),"v=%08x/%d ",GID(NVECTOR(n)),PRIO(NVECTOR(n)));
- proclist = PROCLIST(NVECTOR(n));
- ListProclist(proclist);
-
- if (n == nref) sprintf(pbuf+strlen(pbuf)," X ");
- else sprintf(pbuf+strlen(pbuf)," ");
-
- /* sprintf(pbuf+strlen(pbuf),"n=" ID_FMTX " ",ID_PRTX(n)); */
- sprintf(pbuf+strlen(pbuf),"n=%08x/%d ",GID(n),PRIO(n));
-
- proclist = PROCLIST(n);
- ListProclist(proclist);
- sprintf(pbuf+strlen(pbuf),"\n");
- found++;
- }
- if (found == 0) sprintf(pbuf+strlen(pbuf),"NOT FOUND\n");
-
- UserWriteF("%s\n",pbuf);
-
- return(found);
-}
-
-static INT Grid_ListPeriodicPos (GRID *g, DOUBLE_VECTOR pos)
-{
- DOUBLE tol[3] = {SMALL_DOUBLE,SMALL_DOUBLE,SMALL_DOUBLE};
- NODE *n = FindNodeFromPosition(g,pos,tol);
- INT i,found;
- INT vgid;
-
- if (n != NULL)
- vgid = GID(NVECTOR(n));
- else
- vgid = -1;
- ASSERT(vgid==UG_GlobalMaxINT(vgid) || vgid==-1);
- vgid = UG_GlobalMaxINT(vgid);
-
- if (vgid == -1)
- {
- UserWriteF("NOT FOUND\n");
- return (GM_OK);
- }
-
- found = 0;
- for (i=0; i<procs; i++)
- {
- #ifdef ModelP
- /*
- Synchronize();
- fflush(stdout);
- */
- #endif
- if (me!=i) continue;
-
- found += ListPeriodicNodeAndVec(g,vgid);
- }
- #ifdef ModelP
- fflush(stdout);
- #endif
- found = UG_GlobalSumINT(found);
-
- if (me == master)
- UserWriteF("FOUND %d periodic nodes for this position\n",found);
-
- return (GM_OK);
-}
-
-/****************************************************************************/
-/** \brief
- MG_ListPeriodicPos - list periodic positions and node-vector(-proc) info
-
- * @param mg - multigrid to work on
-
- This function list periodic positions including vector and information
- of all periodic boundaries. In parallel also proclist are printed.
- This should give a clear view onto the periodic data structure.
-
- @return <ul>
- <li> GM_OK if ok </li>
- <li> GM_ERROR if error occured </li>
- */
-/****************************************************************************/
-
-INT NS_DIM_PREFIX MG_ListPeriodicPos (MULTIGRID *mg, INT fl, INT tl, DOUBLE_VECTOR pos)
-{
- INT level;
-
- if (me == master)
- {
-#ifdef __THREEDIM__
- UserWriteF("position is %lf %lf %lf\n",pos[0],pos[1],pos[2]);
-#else
- UserWriteF("position is %lf %lf\n",pos[0],pos[1]);
-#endif
- }
- for (level=fl; level<=tl; level++)
- {
- GRID *g = GRID_ON_LEVEL(mg,level);
-
- /* if (me == master) */
- UserWriteF("LEVEL %4d\n",level);
- if (Grid_ListPeriodicPos(g,pos)) return(GM_ERROR);
- }
-
- return (GM_OK);
-}
#endif
/****************************************************************************/
diff --git a/ui/commands.cc b/ui/commands.cc
index c42202681..3bb1d740a 100644
--- a/ui/commands.cc
+++ b/ui/commands.cc
@@ -4392,33 +4392,6 @@ static INT DumpAlgCommand(INT argc, char **argv)
/****************************************************************************/
#ifdef __PERIODIC_BOUNDARY__
-static INT ListPeriodicPosCommand (INT argc, char **argv)
-{
- MULTIGRID *theMG = currMG;
- DOUBLE_VECTOR pos;
-
- if (theMG == NULL)
- {
- UserWrite("ListPeriodicPos: no open multigrid\n");
- return(OKCODE);
- }
-
-#ifdef __THREEDIM__
- if (sscanf(argv[0],"lppos %lf %lf %lf",pos,pos+1,pos+2) != 3)
-#else
- if (sscanf(argv[0],"lppos %lf %lf",pos,pos+1) != 2)
-#endif
- {
- if (me == master)
- UserWriteF("ListPeriodicPos wrong number of coords\n");
- }
-
- if (MG_ListPeriodicPos(theMG,0,TOPLEVEL(theMG),pos))
- REP_ERR_RETURN (CMDERRORCODE);
-
- return (OKCODE);
-}
-
static INT MakePeriodicCommand (INT argc, char **argv)
{
MULTIGRID *theMG = currMG;
@@ -4459,7 +4432,6 @@ INT NS_DIM_PREFIX InitCommands ()
/* quick hack */
#ifdef __PERIODIC_BOUNDARY__
if (CreateCommand("makeperiodic", MakePeriodicCommand )==NULL) return (__LINE__);
- if (CreateCommand("lppos", ListPeriodicPosCommand )==NULL) return (__LINE__);
#endif
/* general commands */
--
GitLab