Changeset 3269

Timestamp:

11/03/09 10:05:07 (4 months ago)

Author:

kraftche

Message:

o Move vector of CGMParallelComm instances from member of CGMTagManager

to static member of CGMParallelComm

o Remove all dependencies on CGMTagManager from geom/parallel code

o Remove some unnecessary #includes and unused definitions

Location:

cgm/trunk

Files:

• geom/parallel/CGMParallelComm.cpp (modified) (6 diffs)
• geom/parallel/CGMParallelComm.hpp (modified) (6 diffs)
• geom/parallel/ParallelGeomTool.cpp (modified) (2 diffs)
• geom/parallel/ParallelGeomTool.hpp (modified) (3 diffs)
• itaps/CATag.hpp (modified) (3 diffs)

cgm/trunk/geom/parallel/CGMParallelComm.cpp

@@ -1 +1 @@
 #include "CGMParallelComm.hpp"
-//#include "CubitAttrib.hpp"
-//#include "OCCQueryEngine.hpp"
 #include "TopologyEntity.hpp"
 #include "GeometryQueryEngine.hpp"
 #include "RefEntity.hpp"
-
-//#include <iostream>
-#include <sstream>
-#include <algoritm>
-
-#ifdef USE_MPI
-#include "CGMmpi.h"
-#endif
+#include "GeometryQueryTool.hpp"
+
+#include <algorithm>
 
 #define INITIAL_BUFF_SIZE 1024
@@ -21 +14 @@
     return result;}
 
-CGMParallelComm::CGMParallelComm(CGMTagManager *impl,
-                                 MPI_Comm comm, int* id )
-  : cgmImpl(impl), procConfig(comm)
+std::vector<CGMParallelComm*> CGMParallelComm::instanceList;
+
+CGMParallelComm::CGMParallelComm(MPI_Comm comm, int* id )
+  : procConfig(comm)
 {
   myBuffer.resize(INITIAL_BUFF_SIZE);
@@ -46 +40 @@
 }
 
-CGMParallelComm::CGMParallelComm(CGMTagManager *impl,
-                                 std::vector<unsigned char> &tmp_buff, 
+CGMParallelComm::CGMParallelComm(std::vector<unsigned char> &tmp_buff, 
                                  MPI_Comm comm,
                                  int* id) 
-  : cgmImpl(impl), procConfig(comm)
+  : procConfig(comm)
 {
   myBuffer.swap(tmp_buff);
@@ -80 +73 @@
 int CGMParallelComm::add_pcomm(CGMParallelComm *pc) 
 {
-  // add this pcomm to instance tag
-  std::vector<CGMParallelComm *> pc_array;
-  pc_array = cgmImpl->get_pc_array();
-  pc_array.push_back(pc);
-
-  return pc_array.size() - 1;
+  instanceList.push_back(pc);
+  return instanceList.size() - 1;
 }
 
 void CGMParallelComm::remove_pcomm(CGMParallelComm *pc) 
 {
-  // remove this pcomm from instance tag
-  std::vector<CGMParallelComm *> pc_array;
-  pc_array = cgmImpl->get_pc_array();
-
   std::vector<CGMParallelComm*>::iterator pc_it = 
-    std::find(pc_array.begin(), pc_array.end(), pc);
-  assert(pc_it != pc_array.end());
-  pc_array.erase(pc_it);
+    std::find(instanceList.begin(), instanceList.end(), pc);
+  assert(pc_it != instanceList.end());
+  instanceList.erase(pc_it);
 }
 
 //! get the indexed pcomm object from the interface
-CGMParallelComm *CGMParallelComm::get_pcomm(CGMTagManager *impl,
-                                            const int index) 
+CGMParallelComm *CGMParallelComm::get_pcomm(const int index) 
 {  
-  std::vector<CGMParallelComm *> pc_array;
-  pc_array = impl->get_pc_array();
-
-  if (pc_array.size() < (unsigned int) (index + 1)) return NULL;
-  else return pc_array[index];
-}
-
-CubitStatus CGMParallelComm::get_all_pcomm(CGMTagManager *impl,
-                                           std::vector<CGMParallelComm*>& list )
-{
-  list = impl->get_pc_array();
+  if (instanceList.size() < (unsigned int) (index + 1)) return NULL;
+  else return instanceList[index];
+}
+
+CubitStatus CGMParallelComm::get_all_pcomm(std::vector<CGMParallelComm*>& list )
+{
+  list = instanceList;
   return CUBIT_SUCCESS;
 }
@@ -120 +100 @@
 
 //! get the indexed pcomm object from the interface
-CGMParallelComm *CGMParallelComm::get_pcomm(CGMTagManager *impl,
-                                            //MBEntityHandle prtn,
+CGMParallelComm *CGMParallelComm::get_pcomm(//MBEntityHandle prtn,
                                             const MPI_Comm* comm ) 
 {
@@ -140 +119 @@
   //rval = impl->tag_get_data( prtn_tag, &prtn, 1, &pcomm_id );
   //if (MB_SUCCESS == rval) {
-    result= get_pcomm(impl, 
-                      pcomm_id );
+    result= get_pcomm( pcomm_id );
     //}
     /*

cgm/trunk/geom/parallel/CGMParallelComm.hpp

@@ -11 +11 @@
 #define CGM_PARALLEL_COMM_HPP
 
-//#include "CGMForward.hpp"
-#include "GeometryQueryTool.hpp"
-//#include "CGMRange.hpp"
 #include "CGMProcConfig.hpp"
-#include "CATag.hpp"
-#include <map>
-#include <set>
+#include "CGMmpi.h"
+#include "DLIList.hpp"
 #include <vector>
-#include "math.h"
-#include "CGMmpi.h"
 
-
-extern "C" {
-  struct tuple_list;
-}
-
-//class TagServer;
-//class SequenceManager;
-//template <typename KeyType, typename ValType, ValType NullVal> class RangeMap;
-//typedef RangeMap<CGMEntityHandle, CGMEntityHandle, 0> HandleMap;
-
-#define MAX_SHARING_PROCS 64
+class GeometryQueryTool;
+class RefEntity;
 
 class CGMParallelComm 
@@ -39 +24 @@
 
     //! constructor
-  CGMParallelComm(CGMTagManager *impl,
-                  MPI_Comm comm = MPI_COMM_WORLD,
+  CGMParallelComm(MPI_Comm comm = MPI_COMM_WORLD,
                   int* pcomm_id_out = 0);
   
   //! constructor taking buffer, for testing
-  CGMParallelComm(CGMTagManager *impl,
-                  std::vector<unsigned char> &tmp_buff,
+  CGMParallelComm(std::vector<unsigned char> &tmp_buff,
                   MPI_Comm comm = MPI_COMM_WORLD,
                   int* pcomm_id_out = 0);
@@ -53 +36 @@
 
     //! get the indexed pcomm object from the interface
-  static CGMParallelComm *get_pcomm(CGMTagManager *impl,
-                                    const int index);
+  static CGMParallelComm *get_pcomm(const int index);
   
     //! Get CGMParallelComm instance associated with partition handle
     //! Will create CGMParallelComm instance if a) one does not already
     //! exist and b) a valid value for MPI_Comm is passed.
-  static CGMParallelComm *get_pcomm(CGMTagManager *impl,
-                                    //CGMEntityHandle partitioning,
+  static CGMParallelComm *get_pcomm(//CGMEntityHandle partitioning,
                                     const MPI_Comm* comm = 0 );
 
-  static CubitStatus get_all_pcomm(CGMTagManager *impl,
-                                   std::vector<CGMParallelComm*>& list );
+  static CubitStatus get_all_pcomm(std::vector<CGMParallelComm*>& list );
   
   //! destructor
@@ -130 +110 @@
 private:  
 
+  static std::vector<CGMParallelComm*> instanceList;
+
     //! add a pc to the iface instance tag PARALLEL_COMM
-  int add_pcomm(CGMParallelComm *pc);
+  static int add_pcomm(CGMParallelComm *pc);
   
     //! remove a pc from the iface instance tag PARALLEL_COMM
-  void remove_pcomm(CGMParallelComm *pc);
+  static void remove_pcomm(CGMParallelComm *pc);
 
   CubitStatus check_size(int& target_size, const CubitBoolean keep = CUBIT_FALSE);
@@ -141 +123 @@
   GeometryQueryTool *gqt;
 
-    //! CGM tag manager interface associated with this writer
-  CGMTagManager *cgmImpl;
-
     //! Proc config object, keeps info on parallel stuff
   CGMProcConfig procConfig;
-
-    //! Tag server, so we can get more info about tags
-  //TagServer *tagServer;
-
-    //! Sequence manager, to get more efficient access to entities
-  //SequenceManager *sequenceManager;
-  
   
     //! data buffer used to communicate
@@ -162 +134 @@
   
   int m_currentPosition;
-
-  //std::ofstream mOfstream;
-
-    //! more data buffers, proc-specific
-  //std::vector<unsigned char> ownerRBuffs[MAX_SHARING_PROCS],
-  //ownerSBuffs[MAX_SHARING_PROCS], ghostRBuffs[MAX_SHARING_PROCS],
-  // ghostSBuffs[MAX_SHARING_PROCS];
-
-    //! request objects, may be used if store_remote_handles is used
-  //MPI_Request sendReqs[2*MAX_SHARING_PROCS];
-
-    //! processor rank for each buffer index
-  //std::vector<int> buffProcs;
-
-    //! the partition, interface sets for this comm'n instance
-  //CGMRange partitionSets, interfaceSets;
-  
-    //! local entities ghosted to other procs
-  //std::map<unsigned int, CGMRange> ghostedEnts;
-  
-    //! tags used to save sharing procs and handles
-  //CGMTag sharedpTag, sharedpsTag, sharedhTag, sharedhsTag, pstatusTag, 
-  //ifaceSetsTag, partitionTag;
-    
-  //int globalPartCount; //!< Cache of global part count
   
   //CGMEntityHandle partitioningSet; //!< entity set containing all parts

cgm/trunk/geom/parallel/ParallelGeomTool.cpp

@@ -13 +13 @@
 #include "ParallelGeomTool.hpp"
 #include "CGMParallelConventions.h"
-#include "CATag.hpp"
 #include "CGMParallelComm.hpp"
 
@@ -46 +45 @@
 //ParallelGeomTool *ParallelGeomTool::instance_ = NULL;
 
-ParallelGeomTool::ParallelGeomTool(CGMTagManager* impl, CGMParallelComm *pc)
-  : cgmImpl(impl), myPcomm(pc) 
+ParallelGeomTool::ParallelGeomTool(CGMParallelComm *pc)
+  : myPcomm(pc) 
 {
   if (!myPcomm) {
-    myPcomm = CGMParallelComm::get_pcomm(impl, 0);
-    if (NULL == myPcomm) myPcomm = new CGMParallelComm(cgmImpl);
+    myPcomm = CGMParallelComm::get_pcomm(0);
+    if (NULL == myPcomm) myPcomm = new CGMParallelComm();
   }
   //gqt = GeometryQueryTool::instfance();

cgm/trunk/geom/parallel/ParallelGeomTool.hpp

@@ -5 +5 @@
 #include "CubitDefines.h"
 #include "CGMParallelComm.hpp"
-//#include "ProcData.hpp"
 #include "FileOptions.hpp"
-//#include "CATag.hpp"
-//#include "CGMParallelComm.hpp"
-
-//class CGMTagManager;
-//class CGMParallelComm;
 
 class ParallelGeomTool 
@@ -17 +11 @@
 public:
 
-  ParallelGeomTool(CGMTagManager* impl = NULL, CGMParallelComm *pc = NULL);
+  ParallelGeomTool(CGMParallelComm *pc = NULL);
 
   //static ParallelGeomTool *instance();
@@ -71 +65 @@
   //static ParallelGeomTool *instance_;
 
-  CGMTagManager *cgmImpl;
-
   // each reader can keep track of its own pcomm
   CGMParallelComm *myPcomm;

cgm/trunk/itaps/CATag.hpp

@@ -43 +43 @@
 class RefGroup;
 class CATag;
-class CGMParallelComm;
 
 class CGMTagManager 
@@ -118 +117 @@
   }
 
-  inline std::vector<CGMParallelComm*>& get_pc_array() { return pc_array; }
-
 private:
   CGMTagManager();
@@ -132 +129 @@
   static const char *CATag_NAME_INTERNAL;
   RefGroup *interfaceGroup;
-
-  // list of parallel comm
-  std::vector<CGMParallelComm*> pc_array;
 
   bool getPresetTagData(const RefEntity *entity, const long tag_num,