Changeset 158

Timestamp:

03/30/11 09:20:25 (13 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv

Files:

• Makefile.wk (modified) (8 diffs)
• src/xmlio/fortran/ixmlioserver.f03.in (modified) (1 diff)
• src/xmlio/main_server.cpp (modified) (1 diff)

XMLIO_V2/dev/dev_rv/Makefile.wk

@@ -48 +48 @@
 
 ifeq ($(PFORME), sx8-mercure-wk)
-        NETCDF_PATH = /ccc/applications/sx8/netcdf-3.6.1
+        NETCDF_PATH = $(DEV_PATH)/netcdf4
         INTEL_PATH  =
-        BOOST_PATH  = $(DEV_PATH)/extra/boost-1.33
+        BOOST_PATH  = $(DEV_PATH)/extra/boost-1.44
         RXML_PATH   = $(DEV_PATH)/extra/rapidxml-1.13
-        HDF5_PATH   = 
+        HDF5_PATH   = $(DEV_PATH)/hdf5
         MPI_PATH    = /applications/mpisx-8.0.10
 endif
@@ -73 +73 @@
 ifeq ($(COMPTOOL), sx-sx8-mercure-wk)
         CDEP   = $(A)g++
-        CCPP   = $(A)sxc++
+        CCPP   = $(A)sxc++ 
         CFORT  = $(A)sxf90
         LINK   = $(A)sxmpif90 -nofor-main
@@ -80 +80 @@
         RMDIR  = $(A)rm -rf
         REMOVE = $(A)rm -f
-        COPY   = $(A)cp
+        COPY   = $(A)cp -f 
         DOX    = # indisponible
         TAR    = # indisponible
@@ -98 +98 @@
         RMDIR  = $(A)rm -rf
         REMOVE = $(A)rm -f  
-        COPY   = $(A)cp
+        COPY   = $(A)cp -f
         DOX    = # indisponible
         TAR    = # indisponible
@@ -115 +115 @@
         RMDIR  = $(A)rm -rf
         REMOVE = $(A)rm -f  
-        COPY   = $(A)cp
+        COPY   = $(A)cp -f 
         DOX    = $(A)doxygen -s
         TAR    = $(A)tar -cvf
@@ -232 +232 @@
 HDF5_LIB    = $(HDF5_PATH)/lib
 
-ifeq ($(PFORME), sx8-mercure-wk)
-        HDF5_INCL   =
-        HDF5_LIB    =
-endif
-
 LIBS_PATH  += -L $(NETCDF_LIB) -L $(HDF5_LIB)
 LIBS       += -lnetcdf -lhdf5_hl -lhdf5 -lz
@@ -287 +282 @@
         FFLAGS += -J $(LIB_PATH)
         CFLAGS += -ansi -W -Wall -Wno-unused-parameter -Wno-long-long -Wno-deprecated
+endif
+
+ifeq ($(CSUITE), sx)
+        DEF_SX  = -D BOOST_NO_IS_ABSTRACT -D BOOST_NO_RVALUE_REFERENCES -D BOOST_NO_STATIC_ASSERT
+        DEFLAGS = $(DEFINE) $(INCLUDE) $(DEF_SX)
+        CFLAGS += -K exceptions -K rtti -Xp -size_t64 $(DEF_SX)
+        FFLAGS += -f2003 cbind -size_t64 
+else
+        DEFLAGS = $(CFLAGS)
 endif
 
@@ -498 +502 @@
 
 $(DEP_PATH)/%.d: %.cpp $(DEP_PATH)/mark
-        $(CDEP) $(CFLAGS) -D XIOS_NO_EXTERN -MT $(OBJ_PATH)/$(patsubst %.d,%.o,$(@F)) -MM -MF $@ $<
+        $(CDEP) $(DEFLAGS) -D XIOS_NO_EXTERN -MT $(OBJ_PATH)/$(patsubst %.d,%.o,$(@F)) -MM -MF $@ $<
 
 # Entêtes cpp

XMLIO_V2/dev/dev_rv/src/xmlio/fortran/ixmlioserver.f03.in

@@ -7 +7 @@
 
 MODULE IXMLIOSERVER
-   USE ISO_C_BINDING
+   USE, INTRINSIC :: ISO_C_BINDING
 
    ! Ne jamais modifier les valeurs internes de ce type dans le code fortran.

XMLIO_V2/dev/dev_rv/src/xmlio/main_server.cpp

@@ -1 +1 @@
 // XmlIOServer
+//#include <boost/type_traits/is_convertible.hpp>
+//template< typename From, typename To > struct is_convertible : ::boost::integral_constant<bool,(::boost::detail::is_convertible_impl_dispatch<From,To> ::value)>; 
+/*
+namespace boost
+{
+  template< typename From, typename To > struct is_convertible ;
+}
+*/
 #include "xmlioserver.hpp"