Remove deprecated DDD_InfoProcList.

CHANGELOG.md

@@ -13,6 +13,9 @@ SPDX-License-Identifier: LGPL-2.1-or-later
 
 * Remove deprecated `HeapAllocMode` and its flags `FROM_BOTTOM` and `FROM_TOP`.
   They lost any influence, as we use the system heap.
+
+* Remove deprecated `DDD_InfoProcList`, use `DDD_InfoProcListRange` instead.
+
 # dune-uggrid 2.9 (2022-11-25)
 
 * The `dune-uggrid` module does not set the preprocessor flag `HAVE_UG` anymore.

dune/uggrid/parallel/ddd/include/ddd.h

@@ -405,8 +405,6 @@ public:
 
 void     DDD_PrioritySet(DDD::DDDContext& context, DDD_HDR, DDD_PRIO);
 void     DDD_AttrSet (DDD_HDR, DDD_ATTR); /* this shouldn't be allowed */
-[[deprecated("Use `DDD_InfoProcListRange` instead")]]
-int  *   DDD_InfoProcList (DDD::DDDContext& context, DDD_HDR);
 DDD_PROC DDD_InfoProcPrio(const DDD::DDDContext& context, DDD_HDR, DDD_PRIO);
 bool     DDD_InfoIsLocal(const DDD::DDDContext& context, DDD_HDR);
 int      DDD_InfoNCopies(const DDD::DDDContext& context, DDD_HDR);

dune/uggrid/parallel/ddd/mgr/cplmgr.cc

@@ -512,52 +512,6 @@ DDD_InfoProcListRange::DDD_InfoProcListRange(DDDContext& context, const DDD_HDR
   }
 }
 
-/****************************************************************************/
-/*                                                                          */
-/* Function:  DDD_InfoProcList                                              */
-/*                                                                          */
-/* Purpose:   return list of couplings of certain object                    */
-/*                                                                          */
-/* Input:     hdr: DDD-header of object with coupling                       */
-/*                                                                          */
-/* Output:    pointer to localIBuffer, which has been filled with:          */
-/*               1) id of calling processor                                 */
-/*               2) priority of local object copy on calling processor      */
-/*               3) id of processor which holds an object copy              */
-/*               4) priority of copy on that processor                      */
-/*               5) 3+4 repeated for each coupling                          */
-/*               6) processor number = -1 as end mark                       */
-/*                                                                          */
-/****************************************************************************/
-
-int *DDD_InfoProcList (DDD::DDDContext& context, DDD_HDR hdr)
-{
-  auto& mctx = context.cplmgrContext();
-
-COUPLING *cpl;
-int i, objIndex = OBJ_INDEX(hdr);
-
-/* insert description of own (i.e. local) copy */
-mctx.localIBuffer[0] = context.me();
-mctx.localIBuffer[1] = OBJ_PRIO(hdr);
-
-i=2;
-
-/* append descriptions of foreign copies */
-if (objIndex < context.couplingContext().nCpls)
-{
-  for(cpl=IdxCplList(context, objIndex); cpl!=NULL; cpl=CPL_NEXT(cpl), i+=2) {
-    mctx.localIBuffer[i]   = CPL_PROC(cpl);
-    mctx.localIBuffer[i+1] = cpl->prio;
-  }
-}
-
-/* append end mark */
-mctx.localIBuffer[i] = -1;
-
-return(mctx.localIBuffer);
-}
-
 
 
 /****************************************************************************/

dune/uggrid/parallel/dddif/compat.cc

@@ -77,9 +77,4 @@ void DDD_IFOneway(DDD_IF interface, DDD_IF_DIR direction, std::size_t size, ComP
   DDD_IFOneway(globalDDDContext(), interface, direction, size, realGatherWrapper, realScatterWrapper);
 }
 
-int* DDD_InfoProcList(DDD_HDR hdr)
-{
-  return DDD_InfoProcList(globalDDDContext(), hdr);
-}
-
 END_UGDIM_NAMESPACE

dune/uggrid/parallel/dddif/parallel.h

@@ -114,7 +114,7 @@ enum HandlerSets
 #define EVGHOST(e)                                              (EPRIO(e)==PrioVGhost || EPRIO(e)==PrioVHGhost)
 #define EHGHOST(e)                                              (EPRIO(e)==PrioHGhost  || EPRIO(e)==PrioVHGhost)
 #define EGID(e)                                                 DDD_InfoGlobalId(PARHDRE(e))
-#define EPROCLIST(context, e)                           DDD_InfoProcList(context, PARHDRE(e))
+#define EPROCLIST(context, e)                           DDD_InfoProcListRange(context, PARHDRE(e))
 #define EPROCPRIO(context, e,p)                         DDD_InfoProcPrio(context, PARHDRE(e),p)
 #define ENCOPIES(context, e)                                    DDD_InfoNCopies(context, PARHDRE(e))
 #define EATTR(e)                                                DDD_InfoAttr(PARHDRE(e))
@@ -133,7 +133,7 @@ enum HandlerSets
 #define VGHOST(e)                                               (PRIO(e)==PrioVGhost || PRIO(e)==PrioVHGhost)
 #define HGHOST(e)                                               (PRIO(e)==PrioHGhost  || PRIO(e)==PrioVHGhost)
 #define GID(e)                                                  DDD_InfoGlobalId(PARHDR(e))
-#define PROCLIST(context, e)                                    DDD_InfoProcList(context, PARHDR(e))
+#define PROCLIST(context, e)                                    DDD_InfoProcListRange(context, PARHDR(e))
 #define PROCPRIO(context, e,p)                          DDD_InfoProcPrio(context, PARHDR(e),p)
 #define NCOPIES(context, e)                                     DDD_InfoNCopies(context, PARHDR(e))
 #define ATTR(e)                                                 DDD_InfoAttr(PARHDR(e))
@@ -152,7 +152,7 @@ enum HandlerSets
 #define VXVGHOST(e)                                             (VXPRIO(e)==PrioVGhost || VXPRIO(e)==PrioVHGhost)
 #define VXHGHOST(e)                                             (VXPRIO(e)==PrioHGhost || VXPRIO(e)==PrioVHGhost)
 #define VXGID(e)                                                DDD_InfoGlobalId(PARHDRV(e))
-#define VXPROCLIST(context, e)                          DDD_InfoProcList(context, PARHDRV(e))
+#define VXPROCLIST(context, e)                          DDD_InfoProcListRange(context, PARHDRV(e))
 #define VXPROCPRIO(context, e,p)                        DDD_InfoProcPrio(context, PARHDRV(e),p)
 #define VXNCOPIES(context, e)                           DDD_InfoNCopies(context, PARHDRV(e))
 #define VXATTR(e)                                               DDD_InfoAttr(PARHDRV(e))
@@ -378,8 +378,6 @@ void globalDDDContext(std::nullptr_t);
 using ComProcPtr = int (*)(DDD_OBJ, void *);
 [[deprecated("Use `DDD_IFOneway(context, ...)` instead")]]
 void DDD_IFOneway(DDD_IF, DDD_IF_DIR, size_t, ComProcPtr, ComProcPtr);
-[[deprecated("Use `DDD_InfoProcListRange` instead")]]
-int* DDD_InfoProcList(DDD_HDR);
 
 #endif /* ModelP */