Changeset 238

Timestamp:

06/28/11 17:58:28 (13 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv

Files:

• Makefile.wk (modified) (3 diffs)
• src4/xmlio/mpi (added)
• src4/xmlio/mpi/mpi_interface.cpp (added)
• src4/xmlio/mpi/mpi_interface.hpp (added)
• src4/xmlio/netcdf/inetcdf4.hpp (modified) (1 diff)
• src4/xmlio/object.cpp (modified) (1 diff)

XMLIO_V2/dev/dev_rv/Makefile.wk

@@ -208 +208 @@
 OUPT_PATH = $(SRC_PATH)/output
 MNGR_PATH = $(SRC_PATH)/manager
+MPII_PATH = $(SRC_PATH)/mpi
 NCDF_PATH = $(SRC_PATH)/netcdf
 GUI_PATH  = $(SRC_PATH)/qt
@@ -213 +214 @@
 XML_PATH  = $(SRC_PATH)/xml
 
+
 FAKE_PATH = $(SRC_PATH)/fake_client
 
 ################################################################################
 
-VPATH = $(DEP_PATH):$(SRC_PATH):$(CSRC_PATH):$(NODE_PATH) $(XML_PATH)\
-:$(FUNC_PATH):$(DATE_PATH):$(GUI_PATH):$(VTK_PATH):$(INPT_PATH) $(NCDF_PATH)\
-:$(OUPT_PATH):$(MNGR_PATH):$(FAKE_PATH):$(FSRC_PATH):$(CONF_PATH)
+VPATH = $(DEP_PATH):$(SRC_PATH):$(CSRC_PATH):$(NODE_PATH):$(XML_PATH)\
+:$(FUNC_PATH):$(DATE_PATH):$(GUI_PATH):$(VTK_PATH):$(INPT_PATH):$(NCDF_PATH)\
+:$(OUPT_PATH):$(MNGR_PATH):$(FAKE_PATH):$(FSRC_PATH):$(CONF_PATH):$(MPII_PATH)
 
 ######################## Outils de traitements internes ########################
@@ -400 +402 @@
 
 ifeq ($(VERSION), 4)
-        ELEMS_CPP = object exception xml_node xml_parser inetcdf4 inetcdf4_adv lscereader
+        ELEMS_CPP = object exception xml_node xml_parser inetcdf4 inetcdf4_adv lscereader mpi_interface
 endif
 

XMLIO_V2/dev/dev_rv/src4/xmlio/netcdf/inetcdf4.hpp

@@ -24 +24 @@
 
 // C++ standard headers
-#  include <vector>
+#include <vector>
 
 // boost Headers

XMLIO_V2/dev/dev_rv/src4/xmlio/object.cpp

@@ -63 +63 @@
    bool CObject::hasId(void) const
    {
-      return (!this->id);
+      return (this->id);
    }