- Timestamp:
- 03/22/11 16:31:10 (13 years ago)
- Location:
- XMLIO_V2/dev/dev_rv
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
XMLIO_V2/dev/dev_rv/Makefile.wk
r141 r142 2 2 ################### Projet xios - xmlioserver ##################### 3 3 # # 4 # * Copyright © OZDOBA Hervé (herve.ozdoba@lsce.ipsl.fr) * 5 # * © 4 # * Copyright © OZDOBA Hervé (herve.ozdoba@lsce.ipsl.fr) * # 5 # * ©MEURDESOIF Yann (yann.meurdesoif@cea.fr) * # 6 6 # * Avril 2010 - Octobre 2011 * # 7 7 # # … … 11 11 12 12 DEBUG = yes 13 MCOLOR = yes13 MCOLOR = no 14 14 SHOWCMD = yes 15 15 VTK = no 16 16 GUI = no 17 17 NPROC = 2 18 CSUITE = gnu19 PFORME = fedora-wk18 CSUITE = intel 19 PFORME = platine-wk 20 20 FORTEXT = .f90 21 21 DEV_PATH = $(PWD) … … 26 26 27 27 #################################### Chemins ################################### 28 29 ifeq ($(PFORME), platine-wk) 30 NETCDF_PATH = /applications/netcdf-4.1.1 31 INTEL_PATH = 32 BOOST_PATH = /applications/boost-1.37.0/gnu/include/boost-1_37 33 HDF5_PATH = /applications/hdf5-1.8.5 34 MPI_PATH = /applications/openmpi-1.2.9 35 endif 28 36 29 37 ifeq ($(PFORME), fedora-wk) … … 40 48 VERSTR = version $(CSUITE) 41 49 50 ifeq ($(COMPTOOL), intel-platine-wk) 51 CCPP = $(A)icc 52 CFORT = $(A)ifort 53 LINK = $(A)$(MPI_PATH)/bin/mpif90 -nofor-main 54 AR = $(A)ar 55 T2F = # indisponible 56 RMDIR = $(A)rm -rf 57 REMOVE = $(A)rm -f 58 COPY = $(A)cp 59 DOX = # indisponible 60 TAR = # indisponible 61 GZIP = # indisponible 62 EXNET = # indisponible 63 MPIRUN = $(A)$(MPI_PATH)/bin/mpirun 64 endif 65 42 66 ifeq ($(COMPTOOL), gnu-fedora-wk) 43 67 CCPP = $(A)g++ 44 68 CFORT = $(A)gfortran 45 LINK = $(A) /usr/lib/openmpi/bin/mpif9069 LINK = $(A)$(MPI_PATH)/bin/mpif90 46 70 AR = $(A)ar 47 71 T2F = $(A)txt2tags … … 59 83 CCPP = $(A)icc 60 84 CFORT = $(A)ifort 61 LINK = $(A) mpif9085 LINK = $(A)$(MPI_PATH)/bin/mpif90 62 86 AR = $(A)ar 63 87 T2F = $(A)txt2tags … … 143 167 ####################### Chemins vers la bibliothÚque VTK ####################### 144 168 145 INCLUDE += -I /usr/include/vtk 169 ifeq ($(VTK), yes) 170 INCLUDE += -I /usr/include/vtk 171 LIBS += -lvtkCommon -lvtkIO -lvtkFiltering -lvtkRendering -lvtkHybrid 172 DEFINE += -D XIOS_VTK 173 endif 146 174 147 175 ####################### Chemins vers la bibliothÚque NETCDF #################### … … 160 188 ####################### Chemins vers la bibliothÚque MPI ####################### 161 189 162 MPI_LIB = $(MPI_PATH)/bin /190 MPI_LIB = $(MPI_PATH)/bin 163 191 MPI_LIB = $(MPI_PATH)/lib 164 MPI_INCL = /usr/include/openmpi-i386/ 192 MPI_INCL = $(MPI_PATH)/include 193 194 ifeq ($(PFORME), fedora-wk) 195 MPI_INCL = /usr/include/openmpi-i386 196 endif 165 197 166 198 LIBS_PATH += -L $(MPI_LIB) … … 171 203 ################################ VARIABLES ##################################### 172 204 173 LIBS += -lstdc++174 205 INCLUDE += -I $(SRC_PATH) 175 206 DEFINE = -D XIOS_LIBRARY 176 207 177 ifeq ($( VTK), yes)178 LIB S += -lvtkCommon -lvtkIO -lvtkFiltering -lvtkRendering -lvtkHybrid208 ifeq ($(COMPTOOL), gnu-fedoraÃ-w) 209 LIB += -lstdc++ 179 210 endif 180 211 … … 191 222 192 223 ifeq ($(CSUITE), intel) 193 FFLAGS += -module $(LIB_PATH) 194 CFLAGS += -diag-disable 1125 195 endif 224 FFLAGS += -module $(LIB_PATH) 225 CFLAGS += -diag-disable 1125 226 endif 227 228 229 196 230 ifeq ($(CSUITE), gnu) 197 231 FFLAGS += -J $(LIB_PATH) -
XMLIO_V2/dev/dev_rv/src/manager/mpi_manager.hpp
r141 r142 17 17 { 18 18 /// ////////////////////// Déclarations ////////////////////// /// 19 typedef int MPIComm;20 typedef int MPIGroup;21 typedef int MPIRequest;22 typedef int *MPIStatus;23 typedef int MPIDataType;19 typedef MPI_Fint MPIComm; 20 typedef MPI_Fint MPIGroup; 21 typedef MPI_Fint MPIRequest; 22 typedef MPI_Fint *MPIStatus; 23 typedef MPI_Fint MPIDataType; 24 24 25 25 class CMPIManager -
XMLIO_V2/dev/dev_rv/src/output/nc4_data_output.cpp
r141 r142 39 39 40 40 CNc4DataOutput::CNc4DataOutput 41 (const StdString & filename, bool exist, bool multigroup, comm::MPIComm comm_server )41 (const StdString & filename, bool exist, bool multigroup, comm::MPIComm comm_server, bool) 42 42 : SuperClass() 43 43 , SuperClassWriter(filename, exist, &comm_server) -
XMLIO_V2/dev/dev_rv/src/output/nc4_data_output.hpp
r141 r142 29 29 (const StdString & filename, bool exist, bool multigroup, MPI_Comm comm_server); 30 30 CNc4DataOutput 31 (const StdString & filename, bool exist, bool multigroup, comm::MPIComm comm_server );31 (const StdString & filename, bool exist, bool multigroup, comm::MPIComm comm_server, bool); 32 32 33 33 CNc4DataOutput(const CNc4DataOutput & dataoutput); // Not implemented. -
XMLIO_V2/dev/dev_rv/src/output/onetcdf4.cpp
r141 r142 16 16 17 17 CONetCDF4::CONetCDF4 18 (const StdString & filename, bool exist, const comm::MPIComm * comm )18 (const StdString & filename, bool exist, const comm::MPIComm * comm, bool) 19 19 : path() 20 20 { … … 25 25 else 26 26 { 27 MPI_Comm comm_c = MPI_Comm_f2c(*comm);27 MPI_Comm comm_c = (MPI_Comm)MPI_Comm_f2c(*comm); 28 28 this->initialize(filename, exist, &comm_c); 29 29 } -
XMLIO_V2/dev/dev_rv/src/output/onetcdf4.hpp
r141 r142 32 32 /// Constructeurs /// 33 33 CONetCDF4(const StdString & filename, bool exist, const MPI_Comm * comm = NULL); 34 CONetCDF4(const StdString & filename, bool exist, const comm::MPIComm * comm );34 CONetCDF4(const StdString & filename, bool exist, const comm::MPIComm * comm, bool); 35 35 36 36 CONetCDF4(const CONetCDF4 & onetcdf4); // Not implemented.
Note: See TracChangeset
for help on using the changeset viewer.