Changeset 327


Ignore:
Timestamp:
02/24/12 01:33:38 (10 years ago)
Author:
ymipsl
Message:

port to gfortran/g++

YM

Location:
XIOS/trunk
Files:
4 added
8 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/arch/arch-X64_TITANE.fcm

    r287 r327  
    1717%DEBUG_FFLAGS   -DXIOS_DEBUG -g -traceback 
    1818 
    19 %BASE_INC       -D NONE 
     19%BASE_INC       -D __NONE__ 
    2020%BASE_LD        -lstdc++ 
  • XIOS/trunk/bld.cfg

    r316 r327  
    3535bld::tool::cc        %CCOMPILER 
    3636bld::tool::fc        %FCOMPILER 
     37bld::tool::fpp       cpp 
     38bld::tool::cpp       cpp 
    3739bld::tool::cppflags  %BASE_INC -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include -I/usr/include 
     40bld::tool::fppflags  -std=c99 %BASE_INC -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include -I/usr/include 
    3841bld::tool::ld        %LINKER 
    3942bld::tool::ldflags   %LD_FLAGS  
     
    4447 
    4548# Pre-process code before analysing dependencies 
    46 bld::pp              false 
     49bld::pp    false           
     50bld::pp::interface/fortran              true 
     51bld::pp::interface/fortran_attr         true 
    4752bld::excl_dep        use::mod_prism_get_comm 
    4853bld::excl_dep        use::mod_prism_get_localcomm_proto 
  • XIOS/trunk/src/buffer_out.cpp

    r300 r327  
    55namespace xmlioserver 
    66{ 
    7   namespace ym 
    8   { 
    97    CBufferOut::CBufferOut(void* buffer,size_t size) 
    108    { 
     
    6866      if (own) delete [] begin ; 
    6967    } 
    70      
    71   } 
     68  
    7269} 
    7370     
  • XIOS/trunk/src/context_server.hpp

    r300 r327  
    11#ifndef __CONTEXT_SERVER_HPP__ 
    2 #define __CONTEXT_CLIENT_HPP__ 
     2#define __CONTEXT_SERVER_HPP__ 
    33#include "xmlioserver_spl.hpp" 
    44#include "event_server.hpp" 
  • XIOS/trunk/src/node/field.hpp

    r321 r327  
    166166} // namespace xmlioserver 
    167167 
    168 #include "grid.hpp" 
    169  
    170 namespace xmlioserver { 
    171 namespace tree { 
    172  
    173    template <StdSize N> 
    174    void CField::setData(const ARRAY(double, N) _data) 
    175    { 
    176      const std::vector<boost::shared_ptr<CField> > & refField=getAllReference(); 
    177      std::vector<boost::shared_ptr<CField> >::const_iterator  it = refField.begin(), end = refField.end(); 
    178       
    179      for (; it != end; it++) (*it)->updateData(_data) ; 
    180     } 
    181      
    182    template <StdSize N> 
    183       bool CField::updateData(const ARRAY(double, N) _data) 
    184    {         
    185       shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ; 
    186       const date::CDate & currDate = context->getCalendar()->getCurrentDate(); 
    187       const date::CDate opeDate      = *last_operation + freq_operation; 
    188       const date::CDate writeDate    = *last_Write     + freq_write;        
    189  
    190     
    191       info(50) << "CField::updateData " << currDate <<  " : send data to " << this->getBaseFieldId() << std::endl; 
    192       info(50) << "Next operation "  << opeDate<<std::endl; 
    193  
    194       if (opeDate <= currDate) 
    195       { 
    196          if (this->data->num_elements() != this->grid->storeIndex_client->num_elements()) 
    197          { 
    198             this->data->resize(boost::extents[this->grid->storeIndex_client ->num_elements()]); 
    199          } 
    200              
    201          ARRAY_CREATE(input, double, 1, [this->data->num_elements()]); 
    202          this->grid->inputField(_data, input);           
    203          (*this->foperation)(input); 
    204           
    205          *last_operation = currDate; 
    206          info(50) << "(*last_operation = currDate) : " << *last_operation << " = " << currDate << std::endl;  
    207       } 
    208        
    209       if (writeDate < (currDate + freq_operation)) 
    210       { 
    211          this->foperation->final(); 
    212          *last_Write = writeDate; 
    213          info(50) << "(*last_Write = currDate) : " << *last_Write << " = " << currDate  << std::endl; 
    214          sendUpdateData() ; 
    215          return (true);         
    216       } 
    217  
    218       return (false); 
    219    } 
    220  
    221 } // namespace tree 
    222 } // namespace xmlioserver 
    223168 
    224169#endif // __XMLIO_CField__ 
  • XIOS/trunk/src/object_template_impl.hpp

    r314 r327  
    22#define __XMLIO_CObjectTemplate_impl__ 
    33 
     4#include "xmlioserver_spl.hpp" 
     5#include "context_client.hpp" 
    46#include "object_factory.hpp" 
    57#include "context.hpp" 
     
    79#include "attribute.hpp" 
    810#include "event_client.hpp" 
     11#include "object_template.hpp" 
    912#include "context_client.hpp" 
    10 #include "object_template.hpp" 
     13#include "indent.hpp" 
     14#include "type_util.hpp" 
     15#include "message.hpp" 
     16#include "type.hpp" 
    1117 
    1218namespace xmlioserver 
  • XIOS/trunk/src/test/test_cs.f90

    r316 r327  
    6868   
    6969 
    70   CALL xios_initialize(id,local_comm=MPI_COMM_WORLD,return_comm=comm) 
     70  CALL xios_initialize(id,return_comm=comm) 
    7171 
    7272  CALL xios_context_initialize("test",comm) 
  • XIOS/trunk/src/type/type_util.hpp

    r313 r327  
    1919    class CContext; 
    2020  } 
    21     typedef tree::CDomain CDomain; 
    22     typedef tree::CDomainGroup CDomainGroup; 
    23     typedef tree::CField CField; 
    24     typedef tree::CFieldGroup CFieldGroup; 
    25     typedef tree::CGrid CGrid; 
    26     typedef tree::CGridGroup CGridGroup; 
    27     typedef tree::CAxis CAxis; 
    28     typedef tree::CAxisGroup CAxisGroup; 
    29     typedef tree::CFile CFile; 
    30     typedef tree::CFileGroup CFileGroup; 
    31     typedef tree::CContext CContext; 
     21 
     22/* 
     23  typedef tree::CDomain CDomain; 
     24  typedef tree::CDomainGroup CDomainGroup; 
     25  typedef tree::CField CField; 
     26  typedef tree::CFieldGroup CFieldGroup; 
     27  typedef tree::CGrid CGrid; 
     28  typedef tree::CGridGroup CGridGroup; 
     29  typedef tree::CAxis CAxis; 
     30  typedef tree::CAxisGroup CAxisGroup; 
     31  typedef tree::CFile CFile; 
     32  typedef tree::CFileGroup CFileGroup; 
     33  typedef tree::CContext CContext; 
     34*/ 
    3235         
    3336  template <typename T> 
     
    4952  macro(wchar_t) 
    5053  macro(bool) 
     54#undef macro 
     55   
     56#define macro(T) template <> inline string getStrType<tree::T>(void) { return std::string(#T) ; } 
    5157  macro(CDomain) 
    5258  macro(CDomainGroup) 
Note: See TracChangeset for help on using the changeset viewer.