- Timestamp:
- 03/25/11 11:42:58 (13 years ago)
- Location:
- XMLIO_V2/dev/dev_rv
- Files:
-
- 3 added
- 1 deleted
- 33 edited
Legend:
- Unmodified
- Added
- Removed
-
XMLIO_V2/dev/dev_rv/Makefile.wk
r154 r157 21 21 DEV_PATH = $(PWD) 22 22 23 ifeq ($(HOSTNAME), lsce4063.extra.cea.fr) 24 PFORME = fedora-wk 25 endif 23 26 24 27 ifeq ($(HOST), mercure01) … … 36 39 NETCDF_PATH = /applications/netcdf-4.1.1 37 40 INTEL_PATH = 38 BOOST_PATH = $(DEV_PATH)/extra/boost-1.33 41 BOOST_PATH = $(DEV_PATH)/extra/boost-1.44 42 RXML_PATH = $(DEV_PATH)/extra/rapidxml-1.13 39 43 HDF5_PATH = /applications/hdf5-1.8.5 40 44 MPI_PATH = /opt/mpi/mpibull2-1.3.9-18.s 45 41 46 DEFINE += -D MPIBULL_SKIP_MPICXX 42 47 endif 43 48 44 49 ifeq ($(PFORME), sx8-mercure-wk) 45 NETCDF_PATH = /ccc/applications/sx8/netcdf-3.6.1 46 INTEL_PATH = 47 BOOST_PATH = $(DEV_PATH)/extra/boost-1.33 48 HDF5_PATH = 49 MPI_PATH = /applications/mpisx-8.0.10 50 NETCDF_PATH = /ccc/applications/sx8/netcdf-3.6.1 51 INTEL_PATH = 52 BOOST_PATH = $(DEV_PATH)/extra/boost-1.33 53 RXML_PATH = $(DEV_PATH)/extra/rapidxml-1.13 54 HDF5_PATH = 55 MPI_PATH = /applications/mpisx-8.0.10 50 56 endif 51 57 … … 53 59 NETCDF_PATH = $(DEV_PATH)/netcdf4 54 60 INTEL_PATH = /work/intel/composerxe 55 BOOST_PATH = /usr/include 61 BOOST_PATH = $(DEV_PATH)/extra/boost-1.44 62 RXML_PATH = $(DEV_PATH)/extra/rapidxml-1.13 56 63 HDF5_PATH = $(DEV_PATH)/hdf5 57 64 MPI_PATH = /usr/lib/openmpi … … 65 72 66 73 ifeq ($(COMPTOOL), sx-sx8-mercure-wk) 67 74 CDEP = $(A)g++ 68 75 CCPP = $(A)sxc++ 69 70 71 72 73 74 75 76 77 78 79 80 76 CFORT = $(A)sxf90 77 LINK = $(A)sxmpif90 -nofor-main 78 AR = $(A)sxar 79 T2F = # indisponible 80 RMDIR = $(A)rm -rf 81 REMOVE = $(A)rm -f 82 COPY = $(A)cp 83 DOX = # indisponible 84 TAR = # indisponible 85 GZIP = # indisponible 86 EXNET = # indisponible 87 MPIRUN = $(A)$(MPI_PATH)/bin/mpirun 81 88 endif 82 89 … … 167 174 DOC_PATH = $(DEV_PATH)/doc 168 175 DEP_PATH = $(DEV_PATH)/dep 176 INC_PATH = $(DEV_PATH)/include 169 177 DATA_PATH = $(DEV_PATH)/data 170 178 CONF_PATH = $(DEV_PATH)/conf … … 176 184 CSRC_PATH = $(SRC_PATH)/iface 177 185 186 CONF_PATH = $(SRC_PATH)/config 178 187 NODE_PATH = $(SRC_PATH)/node 179 188 FUNC_PATH = $(SRC_PATH)/functor … … 191 200 VPATH = $(DEP_PATH):$(SRC_PATH):$(CSRC_PATH):$(NODE_PATH)\ 192 201 :$(FUNC_PATH):$(DATE_PATH):$(GUI_PATH):$(VTK_PATH):$(INPT_PATH)\ 193 :$(OUPT_PATH):$(MNGR_PATH):$(FAKE_PATH):$(FSRC_PATH) 202 :$(OUPT_PATH):$(MNGR_PATH):$(FAKE_PATH):$(FSRC_PATH):$(CONF_PATH) 194 203 195 204 ######################## Outils de traitements internes ######################## … … 201 210 202 211 INCLUDE = -I $(BOOST_PATH) 212 213 ####################### Chemins vers la bibliothÚque RAPIDXML ################## 214 215 INCLUDE += -I $(RXML_PATH) 203 216 204 217 ####################### Chemins vers la bibliothÚque VTK ####################### … … 219 232 HDF5_LIB = $(HDF5_PATH)/lib 220 233 221 222 234 ifeq ($(PFORME), sx8-mercure-wk) 223 235 HDF5_INCL = … … 246 258 247 259 ifeq ($(PFORME), fedora-wk) 248 260 LIBS += -lmpi_cxx 249 261 endif 250 262 251 263 ################################ VARIABLES ##################################### 252 264 253 INCLUDE += -I $( SRC_PATH)265 INCLUDE += -I $(INC_PATH) 254 266 DEFINE += -D XIOS_LIBRARY 255 267 … … 331 343 OSOURCE = onetcdf4 nc4_data_output 332 344 333 # Source des faux client 345 # Source des faux clients 334 346 TSOURCE = fake_nemo fake_lmdz fake_orchidee 335 347 … … 341 353 342 354 ############################## Modifications ################################## 355 356 AHEADERS = \ 357 $(notdir $(wildcard $(SRC_PATH)/*/*.conf))\ 358 $(notdir $(wildcard $(SRC_PATH)/*/*.hpp))\ 359 $(notdir $(wildcard $(SRC_PATH)/*.hpp)) 360 361 HEADERS = $(addprefix $(INC_PATH)/, $(AHEADERS)) 343 362 344 363 ELEMS_FOR = $(TSOURCE) $(IFSOURCE) … … 354 373 355 374 ################################### RÚgles ##################################### 356 357 375 all: depend build 358 376 … … 368 386 369 387 .PHONY: depend 370 depend: preproc $(DEPENDS) 388 depend: preproc $(DEPENDS) cheaders 389 390 .PHONY: cheaders 391 cheaders: $(HEADERS) 371 392 372 393 .PHONY: preproc … … 376 397 clean-depend: 377 398 $(REMOVE) $(DEP_PATH)/*.d 399 $(REMOVE) $(DEP_PATH)/mark 378 400 379 401 clean-t2t: 380 402 #$(REMOVE) $(COM_T2T) 381 403 404 clean-h: 405 $(REMOVE) $(INC_PATH)/*.hpp 406 $(REMOVE) $(INC_PATH)/*.conf 407 382 408 clean-doc: clean-t2t 383 409 $(RMDIR) $(DOC_PATH)/html … … 412 438 clean-mod \ 413 439 clean-gen \ 440 clean-h \ 414 441 clean-depend 415 442 … … 441 468 $(call COLORMSG, $(C_Purple),"Génération du serveur d'E/S de l'IPSL ($(VERSTR) C++) ...") 442 469 $(LINK) -o $@ $^ $(LDFLAGS) 443 470 444 471 $(LIBSTATIC) : $(OBJECTS) 445 472 $(call COLORMSG, $(C_Green),"Génération de l'archive de la bibliothÚque d'E/S de l'IPSL...") … … 467 494 468 495 # Dépendances 469 $(DEP_PATH)/%.d: %.cpp 496 $(DEP_PATH)/mark: $(HEADERS) 497 @touch $@ 498 499 $(DEP_PATH)/%.d: %.cpp $(DEP_PATH)/mark 470 500 $(CDEP) $(CFLAGS) -D XIOS_NO_EXTERN -MT $(OBJ_PATH)/$(patsubst %.d,%.o,$(@F)) -MM -MF $@ $< 501 502 # Entêtes cpp 503 $(INC_PATH)/%.hpp: %.hpp 504 $(COPY) $< $@ 505 506 $(INC_PATH)/%.conf: %.conf 507 $(COPY) $< $@ 471 508 472 509 # Objets cpp … … 475 512 476 513 # Objets fortran 477 478 514 $(FSRC_PATH)/%.f03: %.f90 479 515 $(COPY) $< $@ -
XMLIO_V2/dev/dev_rv/src/xmlio/buffer.cpp
r152 r157 1 1 #include "buffer.hpp" 2 2 3 #include "m anager/mpi_manager.hpp"3 #include "mpi_manager.hpp" 4 4 #include "buffer_impl.hpp" 5 5 -
XMLIO_V2/dev/dev_rv/src/xmlio/buffer_list.hpp
r152 r157 7 7 #include "circular_buffer.hpp" 8 8 #include "linear_buffer.hpp" 9 #include "m anager/mpi_manager.hpp"9 #include "mpi_manager.hpp" 10 10 11 11 namespace xmlioserver -
XMLIO_V2/dev/dev_rv/src/xmlio/buffer_pair.hpp
r152 r157 7 7 #include "circular_buffer.hpp" 8 8 #include "linear_buffer.hpp" 9 #include "m anager/mpi_manager.hpp"9 #include "mpi_manager.hpp" 10 10 11 11 namespace xmlioserver -
XMLIO_V2/dev/dev_rv/src/xmlio/calendar_util.cpp
r152 r157 1 1 #include "calendar_util.hpp" 2 3 2 4 3 namespace xmlioserver -
XMLIO_V2/dev/dev_rv/src/xmlio/configure.cpp
r152 r157 11 11 namespace xmlioserver 12 12 { 13 #include " config/properties.conf"13 #include "properties.conf" 14 14 } // namespace xmlioserver -
XMLIO_V2/dev/dev_rv/src/xmlio/configure.hpp
r152 r157 11 11 namespace xmlioserver 12 12 { 13 #include " config/properties.conf"13 #include "properties.conf" 14 14 } // namespace xmlioserver 15 15 -
XMLIO_V2/dev/dev_rv/src/xmlio/data_output.hpp
r152 r157 5 5 #include "xmlioserver_spl.hpp" 6 6 #include "exception.hpp" 7 #include " node/grid.hpp"8 #include " node/field.hpp"7 #include "grid.hpp" 8 #include "field.hpp" 9 9 10 10 #include <mpi.h> -
XMLIO_V2/dev/dev_rv/src/xmlio/data_treatment.hpp
r152 r157 4 4 /// xmlioserver headers /// 5 5 #include "xmlioserver_spl.hpp" 6 #include "node /node_type.hpp"7 #include "m anager/mpi_manager.hpp"6 #include "node_type.hpp" 7 #include "mpi_manager.hpp" 8 8 #include "data_output.hpp" 9 9 -
XMLIO_V2/dev/dev_rv/src/xmlio/functor.hpp
r152 r157 78 78 } // namespace xmlioserver 79 79 80 #include "functor /functor_type.hpp"80 #include "functor_type.hpp" 81 81 82 82 #endif // __XMLIO_CFunctor__ -
XMLIO_V2/dev/dev_rv/src/xmlio/group_factory.cpp
r152 r157 7 7 8 8 void CGroupFactory::SetCurrentContextId(const StdString & context) 9 { CGroupFactory::CurrContext = context; } 9 { 10 CGroupFactory::CurrContext = context; 11 } 10 12 11 13 StdString & CGroupFactory::GetCurrentContextId(void) 12 { return (CGroupFactory::CurrContext); } 14 { 15 return (CGroupFactory::CurrContext); 16 } 13 17 14 18 } // namespace xmlioserver -
XMLIO_V2/dev/dev_rv/src/xmlio/main_server.cpp
r152 r157 2 2 #include "xmlioserver.hpp" 3 3 4 #include "fake _client/fake.hpp"4 #include "fake.hpp" 5 5 #include "attribute_template_impl.hpp" 6 #include " output/nc4_data_output.hpp"6 #include "nc4_data_output.hpp" 7 7 8 8 // Point d'entrée du programme principal -
XMLIO_V2/dev/dev_rv/src/xmlio/manager/mpi_manager.cpp
r152 r157 1 1 #include "mpi_manager.hpp" 2 2 3 #include " fortran/impi_interface.hpp"3 #include "impi_interface.hpp" 4 4 5 5 namespace xmlioserver -
XMLIO_V2/dev/dev_rv/src/xmlio/manager/tree_manager.hpp
r152 r157 4 4 /// xmlioserver headers /// 5 5 #include "xmlioserver_spl.hpp" 6 #include "node /node_type.hpp"6 #include "node_type.hpp" 7 7 #include "xml_parser.hpp" 8 8 #include "indent.hpp" -
XMLIO_V2/dev/dev_rv/src/xmlio/mask.cpp
r152 r157 23 23 24 24 const int * CMask::getData(void) const 25 { return (SuperClass::data()); } 25 { 26 return (SuperClass::data()); 27 } 26 28 27 29 //--------------------------------------------------------------- -
XMLIO_V2/dev/dev_rv/src/xmlio/node/axis.hpp
r152 r157 22 22 // Declare/Define CAxisAttribute 23 23 BEGIN_DECLARE_ATTRIBUTE_MAP(CAxis) 24 #include " ../config/axis_attribute.conf"24 #include "axis_attribute.conf" 25 25 END_DECLARE_ATTRIBUTE_MAP(CAxis) 26 26 -
XMLIO_V2/dev/dev_rv/src/xmlio/node/context.cpp
r152 r157 61 61 continue; } 62 62 #define DECLARE_NODE_PAR(Name_, name_) 63 #include " ../config/node_type.conf"63 #include "node_type.conf" 64 64 65 65 DEBUG(<< "L'élément nommé \'" << name … … 116 116 oss << *CObjectFactory::GetObject<C##Name_##Definition>(C##Name_##Definition::GetDefName()) << std::endl; 117 117 #define DECLARE_NODE_PAR(Name_, name_) 118 #include " ../config/node_type.conf"118 #include "node_type.conf" 119 119 120 120 } … … 131 131 CObjectFactory::GetObject<C##Name_##Definition>(C##Name_##Definition::GetDefName())->solveDescInheritance(); 132 132 #define DECLARE_NODE_PAR(Name_, name_) 133 #include " ../config/node_type.conf"133 #include "node_type.conf" 134 134 } 135 135 … … 140 140 CObjectFactory::HasObject<C##Name_##Definition> (C##Name_##Definition::GetDefName()) || 141 141 #define DECLARE_NODE_PAR(Name_, name_) 142 #include " ../config/node_type.conf"142 #include "node_type.conf" 143 143 false); 144 144 } -
XMLIO_V2/dev/dev_rv/src/xmlio/node/context.hpp
r152 r157 21 21 // Declare/Define CFileAttribute 22 22 BEGIN_DECLARE_ATTRIBUTE_MAP(CContext) 23 #include " ../config/context_attribute.conf"23 #include "context_attribute.conf" 24 24 END_DECLARE_ATTRIBUTE_MAP(CContext) 25 25 -
XMLIO_V2/dev/dev_rv/src/xmlio/node/domain.hpp
r152 r157 23 23 // Declare/Define CDomainAttribute 24 24 BEGIN_DECLARE_ATTRIBUTE_MAP(CDomain) 25 #include " ../config/domain_attribute.conf"25 #include "domain_attribute.conf" 26 26 END_DECLARE_ATTRIBUTE_MAP(CDomain) 27 27 -
XMLIO_V2/dev/dev_rv/src/xmlio/node/field.hpp
r152 r157 7 7 8 8 #include "functor.hpp" 9 #include "functor /functor_type.hpp"9 #include "functor_type.hpp" 10 10 11 11 #include "declare_group.hpp" … … 28 28 // Declare/Define CFieldAttribute 29 29 BEGIN_DECLARE_ATTRIBUTE_MAP(CField) 30 #include " ../config/field_attribute.conf"30 #include "field_attribute.conf" 31 31 END_DECLARE_ATTRIBUTE_MAP(CField) 32 32 -
XMLIO_V2/dev/dev_rv/src/xmlio/node/file.hpp
r152 r157 23 23 // Declare/Define CFileAttribute 24 24 BEGIN_DECLARE_ATTRIBUTE_MAP(CFile) 25 #include " ../config/file_attribute.conf"25 #include "file_attribute.conf" 26 26 END_DECLARE_ATTRIBUTE_MAP(CFile) 27 27 -
XMLIO_V2/dev/dev_rv/src/xmlio/node/grid.hpp
r152 r157 24 24 // Declare/Define CGridAttribute 25 25 BEGIN_DECLARE_ATTRIBUTE_MAP(CGrid) 26 #include " ../config/grid_attribute.conf"26 #include "grid_attribute.conf" 27 27 END_DECLARE_ATTRIBUTE_MAP(CGrid) 28 28 -
XMLIO_V2/dev/dev_rv/src/xmlio/node/method.hpp
r152 r157 17 17 // Declare/Define CMethodAttribute 18 18 BEGIN_DECLARE_ATTRIBUTE_MAP(CMethod) 19 #include " ../config/method_attribute.conf"19 #include "method_attribute.conf" 20 20 END_DECLARE_ATTRIBUTE_MAP(CMethod) 21 21 -
XMLIO_V2/dev/dev_rv/src/xmlio/node/node_enum.hpp
r152 r157 14 14 Unknown = 0 15 15 16 #include " config/node_type.conf"16 #include "node_type.conf" 17 17 18 18 } ENodeType; -
XMLIO_V2/dev/dev_rv/src/xmlio/node/var.hpp
r152 r157 17 17 // Declare/Define CVarAttribute 18 18 BEGIN_DECLARE_ATTRIBUTE_MAP(CVar) 19 #include " ../config/var_attribute.conf"19 #include "var_attribute.conf" 20 20 END_DECLARE_ATTRIBUTE_MAP(CVar) 21 21 -
XMLIO_V2/dev/dev_rv/src/xmlio/object.cpp
r152 r157 20 20 { /* Ne rien faire de plus */ } 21 21 22 const StdString & CObject::getId(void) const { return (this->id); } 22 const StdString & CObject::getId(void) const 23 { 24 return (this->id); 25 } 23 26 24 bool CObject::hasId(void) const { return (this->IdDefined); } 27 bool CObject::hasId(void) const 28 { 29 return (this->IdDefined); 30 } 25 31 26 void CObject::resetId(void) { this->IdDefined = false ;} 32 void CObject::resetId(void) 33 { 34 this->IdDefined = false ; 35 } 27 36 28 37 void CObject::setId(const StdString & id) 29 { this->id = id ; this->IdDefined = true ; } 38 { 39 this->id = id ; 40 this->IdDefined = true ; 41 } 30 42 31 43 bool CObject::operator==(const CObject & other) const … … 37 49 38 50 bool CObject::operator!=(const CObject & other) const 39 { return (!(*this == other)); } 51 { 52 return (!(*this == other)); 53 } 40 54 41 55 StdOStream & operator << (StdOStream & os, const CObject & object) 42 { os << object.toString(); return (os); } 56 { 57 os << object.toString(); 58 return (os); 59 } 43 60 44 61 } // namespace xmlioserver -
XMLIO_V2/dev/dev_rv/src/xmlio/object_template.hpp
r152 r157 5 5 #include "xmlioserver_spl.hpp" 6 6 #include "attribute_map.hpp" 7 #include "node /node_enum.hpp"7 #include "node_enum.hpp" 8 8 9 9 namespace xmlioserver -
XMLIO_V2/dev/dev_rv/src/xmlio/output/nc4_data_output.cpp
r152 r157 4 4 #include "attribute_template_impl.hpp" 5 5 6 #include " node/file.hpp"6 #include "file.hpp" 7 7 8 8 namespace xmlioserver -
XMLIO_V2/dev/dev_rv/src/xmlio/output/nc4_data_output.hpp
r152 r157 5 5 #include "xmlioserver_spl.hpp" 6 6 #include "onetcdf4.hpp" 7 #include " ../data_output.hpp"7 #include "data_output.hpp" 8 8 9 9 namespace xmlioserver -
XMLIO_V2/dev/dev_rv/src/xmlio/output/onetcdf4.hpp
r152 r157 7 7 #include "array.hpp" 8 8 #include "mask.hpp" 9 #include " ../data_output.hpp"10 #include "m anager/mpi_manager.hpp"9 #include "data_output.hpp" 10 #include "mpi_manager.hpp" 11 11 12 12 #include <mpi.h> -
XMLIO_V2/dev/dev_rv/src/xmlio/xml_node.hpp
r152 r157 3 3 4 4 /// rapidXML headers /// 5 #include < xml/rapidxml.hpp>5 #include <rapidxml.hpp> 6 6 7 7 /// xmlioserver headers /// -
XMLIO_V2/dev/dev_rv/src/xmlio/xml_parser.hpp
r152 r157 5 5 #include "xmlioserver_spl.hpp" 6 6 #include "xml_node.hpp" 7 #include " node/context.hpp"7 #include "context.hpp" 8 8 9 9 namespace xmlioserver -
XMLIO_V2/dev/dev_rv/src/xmlio/xmlioserver.hpp
r152 r157 5 5 6 6 /// xmlioserver headers /// 7 #include "m anager/mpi_manager.hpp"8 #include " manager/tree_manager.hpp"9 #include " manager/xios_manager.hpp"7 #include "mpi_manager.hpp" 8 #include "tree_manager.hpp" 9 #include "xios_manager.hpp" 10 10 #include "data_treatment.hpp" 11 #include " output/nc4_data_output.hpp"11 #include "nc4_data_output.hpp" 12 12 13 13 //#include "data_manager.hpp"
Note: See TracChangeset
for help on using the changeset viewer.