Changeset 327 for XIOS/trunk

Timestamp:

02/24/12 01:33:38 (12 years ago)

Author:

ymipsl

Message:

port to gfortran/g++

YM

Location:

XIOS/trunk

Files:

• arch/arch-GCC_LINUX.env (added)
• arch/arch-GCC_LINUX.fcm (added)
• arch/arch-GCC_LINUX.path (added)
• arch/arch-X64_TITANE.fcm (modified) (1 diff)
• bld.cfg (modified) (2 diffs)
• src/buffer_out.cpp (modified) (2 diffs)
• src/context_server.hpp (modified) (1 diff)
• src/field_impl.hpp (added)
• src/node/field.hpp (modified) (1 diff)
• src/object_template_impl.hpp (modified) (2 diffs)
• src/test/test_cs.f90 (modified) (1 diff)
• src/type/type_util.hpp (modified) (2 diffs)

XIOS/trunk/arch/arch-X64_TITANE.fcm

@@ -17 +17 @@
 %DEBUG_FFLAGS   -DXIOS_DEBUG -g -traceback
 
-%BASE_INC       -D NONE
+%BASE_INC       -D __NONE__
 %BASE_LD        -lstdc++

XIOS/trunk/bld.cfg

@@ -35 +35 @@
 bld::tool::cc        %CCOMPILER
 bld::tool::fc        %FCOMPILER
+bld::tool::fpp       cpp
+bld::tool::cpp       cpp
 bld::tool::cppflags  %BASE_INC -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include -I/usr/include
+bld::tool::fppflags  -std=c99 %BASE_INC -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include -I/usr/include
 bld::tool::ld        %LINKER
 bld::tool::ldflags   %LD_FLAGS 
@@ -44 +47 @@
 
 # Pre-process code before analysing dependencies
-bld::pp              false
+bld::pp    false          
+bld::pp::interface/fortran              true
+bld::pp::interface/fortran_attr         true
 bld::excl_dep        use::mod_prism_get_comm
 bld::excl_dep        use::mod_prism_get_localcomm_proto

XIOS/trunk/src/buffer_out.cpp

@@ -5 +5 @@
 namespace xmlioserver
 {
-  namespace ym
-  {
     CBufferOut::CBufferOut(void* buffer,size_t size)
     {
@@ -68 +66 @@
       if (own) delete [] begin ;
     }
-    
-  }
+ 
 }
     

XIOS/trunk/src/context_server.hpp

@@ -1 +1 @@
 #ifndef __CONTEXT_SERVER_HPP__
-#define __CONTEXT_CLIENT_HPP__
+#define __CONTEXT_SERVER_HPP__
 #include "xmlioserver_spl.hpp"
 #include "event_server.hpp"

XIOS/trunk/src/node/field.hpp

@@ -166 +166 @@
 } // namespace xmlioserver
 
-#include "grid.hpp"
-
-namespace xmlioserver {
-namespace tree {
-
-   template <StdSize N>
-   void CField::setData(const ARRAY(double, N) _data)
-   {
-     const std::vector<boost::shared_ptr<CField> > & refField=getAllReference();
-     std::vector<boost::shared_ptr<CField> >::const_iterator  it = refField.begin(), end = refField.end();
-     
-     for (; it != end; it++) (*it)->updateData(_data) ;
-    }
-    
-   template <StdSize N>
-      bool CField::updateData(const ARRAY(double, N) _data)
-   {        
-      shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ;
-      const date::CDate & currDate = context->getCalendar()->getCurrentDate();
-      const date::CDate opeDate      = *last_operation + freq_operation;
-      const date::CDate writeDate    = *last_Write     + freq_write;       
-
-   
-      info(50) << "CField::updateData " << currDate <<  " : send data to " << this->getBaseFieldId() << std::endl;
-      info(50) << "Next operation "  << opeDate<<std::endl;
-
-      if (opeDate <= currDate)
-      {
-         if (this->data->num_elements() != this->grid->storeIndex_client->num_elements())
-         {
-            this->data->resize(boost::extents[this->grid->storeIndex_client ->num_elements()]);
-         }
-            
-         ARRAY_CREATE(input, double, 1, [this->data->num_elements()]);
-         this->grid->inputField(_data, input);          
-         (*this->foperation)(input);
-         
-         *last_operation = currDate;
-         info(50) << "(*last_operation = currDate) : " << *last_operation << " = " << currDate << std::endl; 
-      }
-      
-      if (writeDate < (currDate + freq_operation))
-      {
-         this->foperation->final();
-         *last_Write = writeDate;
-         info(50) << "(*last_Write = currDate) : " << *last_Write << " = " << currDate  << std::endl;
-         sendUpdateData() ;
-         return (true);        
-      }
-
-      return (false);
-   }
-
-} // namespace tree
-} // namespace xmlioserver
 
 #endif // __XMLIO_CField__

XIOS/trunk/src/object_template_impl.hpp

@@ -2 +2 @@
 #define __XMLIO_CObjectTemplate_impl__
 
+#include "xmlioserver_spl.hpp"
+#include "context_client.hpp"
 #include "object_factory.hpp"
 #include "context.hpp"
@@ -7 +9 @@
 #include "attribute.hpp"
 #include "event_client.hpp"
+#include "object_template.hpp"
 #include "context_client.hpp"
-#include "object_template.hpp"
+#include "indent.hpp"
+#include "type_util.hpp"
+#include "message.hpp"
+#include "type.hpp"
 
 namespace xmlioserver

XIOS/trunk/src/test/test_cs.f90

@@ -68 +68 @@
   
 
-  CALL xios_initialize(id,local_comm=MPI_COMM_WORLD,return_comm=comm)
+  CALL xios_initialize(id,return_comm=comm)
 
   CALL xios_context_initialize("test",comm)

XIOS/trunk/src/type/type_util.hpp

@@ -19 +19 @@
     class CContext;
   }
-    typedef tree::CDomain CDomain;
-    typedef tree::CDomainGroup CDomainGroup;
-    typedef tree::CField CField;
-    typedef tree::CFieldGroup CFieldGroup;
-    typedef tree::CGrid CGrid;
-    typedef tree::CGridGroup CGridGroup;
-    typedef tree::CAxis CAxis;
-    typedef tree::CAxisGroup CAxisGroup;
-    typedef tree::CFile CFile;
-    typedef tree::CFileGroup CFileGroup;
-    typedef tree::CContext CContext;
+
+/*
+  typedef tree::CDomain CDomain;
+  typedef tree::CDomainGroup CDomainGroup;
+  typedef tree::CField CField;
+  typedef tree::CFieldGroup CFieldGroup;
+  typedef tree::CGrid CGrid;
+  typedef tree::CGridGroup CGridGroup;
+  typedef tree::CAxis CAxis;
+  typedef tree::CAxisGroup CAxisGroup;
+  typedef tree::CFile CFile;
+  typedef tree::CFileGroup CFileGroup;
+  typedef tree::CContext CContext;
+*/
         
   template <typename T>
@@ -49 +52 @@
   macro(wchar_t)
   macro(bool)
+#undef macro
+  
+#define macro(T) template <> inline string getStrType<tree::T>(void) { return std::string(#T) ; }
   macro(CDomain)
   macro(CDomainGroup)