New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 3472 – NEMO

Changeset 3472


Ignore:
Timestamp:
2012-09-07T12:13:12+02:00 (12 years ago)
Author:
rblod
Message:

Load XIOS_SRC into vendors/XIOS/current.

Location:
vendors/XIOS/current
Files:
4 added
11 edited

Legend:

Unmodified
Added
Removed

  • vendors/XIOS/current/bld.cfg

    r3428 r3472  
    3535bld::tool::cc        %CCOMPILER 
    3636bld::tool::fc        %FCOMPILER 
    37 bld::tool::fpp       cpp 
     37bld::tool::fpp       cpp -P 
    3838bld::tool::cpp       cpp 
    3939bld::tool::cppflags  %BASE_INC -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include  

  • vendors/XIOS/current/extern/boost/include/boost/config/select_compiler_config.hpp

    r3428 r3472  
    121121//  example) also #define _MSC_VER 
    122122#   define BOOST_COMPILER_CONFIG "boost/config/compiler/visualc.hpp" 
     123#elif defined _CRAYC 
     124// EDG based Cray compiler: 
     125#   define BOOST_COMPILER_CONFIG "boost/config/compiler/cray.hpp" 
    123126 
    124127#elif defined (BOOST_ASSERT_CONFIG) 

  • vendors/XIOS/current/src/attribute_template.hpp

    r3428 r3472  
    4040 
    4141            /// Accesseur /// 
    42             inline ValueType getValue(void) const; 
    43             inline ValueType* getRef(void) ; 
     42            ValueType getValue(void) const; 
     43            ValueType* getRef(void) ; 
    4444 
    4545            /// Mutateurs /// 
    46             inline void setValue(const ValueType & value); 
     46            void setValue(const ValueType & value); 
    4747 
    4848            /// Destructeur /// 

  • vendors/XIOS/current/src/generate_interface_impl.hpp

    r3428 r3472  
    207207   } 
    208208     
    209 #define macro(T)\      
     209#define macro(T)\ 
    210210   template <>\ 
    211211   void CInterface::AttributeFortran2003Interface<ARRAY(T,1)>(ostream& oss,const string& className,const string& name) \ 
    … …  
    309309   } 
    310310 
    311 #define macro(T)\    
     311#define macro(T)\ 
    312312   template <> \ 
    313313   void CInterface::AttributeFortranInterfaceDeclaration<ARRAY(T,1)>(ostream& oss,const string& className,const string& name) \ 

  • vendors/XIOS/current/src/group_factory.hpp

    r3428 r3472  
    2323 
    2424         template <typename U> 
    25             static inline void AddGroup(boost::shared_ptr<U> pgroup, 
     25            static void AddGroup(boost::shared_ptr<U> pgroup, 
    2626                                        boost::shared_ptr<U> cgroup); 
    2727 
    2828         template <typename U> 
    29             static inline void AddChild(boost::shared_ptr<U> group, 
     29            static void AddChild(boost::shared_ptr<U> group, 
    3030                                        boost::shared_ptr<typename U::RelChild> child); 
    3131 
    … …  
    3434 
    3535         template <typename U> 
    36             static inline boost::shared_ptr<U> 
     36            static boost::shared_ptr<U> 
    3737               GetGroup(boost::shared_ptr<U> group, const StdString & id); 
    3838 
    3939         template <typename U> 
    40             static inline boost::shared_ptr<typename U::RelChild> 
     40            static boost::shared_ptr<typename U::RelChild> 
    4141               GetChild(boost::shared_ptr<U> group, const StdString & id); 
    4242 
    4343         template <typename U> 
    44             static inline int GetGroupNum(boost::shared_ptr<U> group); 
     44            static int GetGroupNum(boost::shared_ptr<U> group); 
    4545         template <typename U> 
    46             static inline int GetGroupIdNum(boost::shared_ptr<U> group); 
     46            static int GetGroupIdNum(boost::shared_ptr<U> group); 
    4747         template <typename U> 
    48             static inline int GetChildNum(boost::shared_ptr<U> group); 
     48            static int GetChildNum(boost::shared_ptr<U> group); 
    4949         template <typename U> 
    50             static inline int GetChildIdNum(boost::shared_ptr<U> group); 
     50            static int GetChildIdNum(boost::shared_ptr<U> group); 
    5151 
    5252         /// Tests /// 
    5353         template <typename U> 
    54             static inline bool HasGroup(boost::shared_ptr<U> group, const StdString & id); 
     54            static bool HasGroup(boost::shared_ptr<U> group, const StdString & id); 
    5555 
    5656         template <typename U> 
    57             static inline bool HasChild(boost::shared_ptr<U> group, const StdString & id); 
     57            static bool HasChild(boost::shared_ptr<U> group, const StdString & id); 
    5858 
    5959         /// Instanciateur /// 
    6060         template <typename U> 
    61             static inline boost::shared_ptr<U> 
     61            static boost::shared_ptr<U> 
    6262               CreateGroup(boost::shared_ptr<U> group, const StdString & id = StdString("")); 
    6363 
    6464         template <typename U> 
    65             static inline boost::shared_ptr<typename U::RelChild> 
     65            static boost::shared_ptr<typename U::RelChild> 
    6666               CreateChild(boost::shared_ptr<U> group, const StdString & id = StdString("")); 
    6767 

  • vendors/XIOS/current/src/group_template.hpp

    r3428 r3472  
    5555 
    5656         /// Accesseurs statiques /// 
    57          static inline StdString GetName(void); 
    58          static inline StdString GetDefName(void); 
     57         static StdString GetName(void); 
     58         static StdString GetDefName(void); 
    5959 
    6060         /// Traitements /// 

  • vendors/XIOS/current/src/node/context.cpp

    r3428 r3472  
    248248   { 
    249249#define DECLARE_NODE(Name_, name_)    \ 
    250    if (C##Name_##Definition::has(C##Name_##Definition::GetDefName())) \  
     250   if (C##Name_##Definition::has(C##Name_##Definition::GetDefName())) \ 
    251251     C##Name_##Definition::get(C##Name_##Definition::GetDefName())->solveDescInheritance(); 
    252252#define DECLARE_NODE_PAR(Name_, name_) 

  • vendors/XIOS/current/src/output/onetcdf4.cpp

    r3428 r3472  
    360360                                    const std::vector<StdSize> & scount, double * data) 
    361361      { 
     362         cout<<"writeData_"<<endl ; 
     363         for(int i=0;i<sstart.size();i++) cout<<sstart[i]<<"   " ; 
     364         cout<<endl ; 
     365         for(int i=0;i<scount.size();i++) cout<<scount[i]<<"   " ; 
     366         cout<<endl ; 
     367          
    362368         CheckError(nc_put_vara_double(grpid, varid, &(sstart[0]), &(scount[0]), data)); 
    363369//         sync() ; 

  • vendors/XIOS/current/src/output/onetcdf4.hpp

    r3428 r3472  
    1111#define MPI_INCLUDED 
    1212#include <netcdf.h> 
     13#ifdef NETCDF_PAR_HEADER 
    1314extern "C" { 
    1415#include <netcdf_par.h> 
    1516} 
     17#endif 
    1618 
    1719 

  • vendors/XIOS/current/src/output/onetcdf4_impl.hpp

    r3428 r3472  
    4545    if (value != NULL) 
    4646    { 
    47       CheckError(nc_def_var_fill(grpid, varid, 0, value)); 
     47      CheckError(nc_def_var_fill(grpid, varid, 0, (void*)value)); 
    4848      this->addAttribute(StdString("missing_value"), *value, &varname); 
    4949    } 

  • vendors/XIOS/current/src/type/type_specialisation.hpp

    r3428 r3472  
    9696*/ 
    9797 
    98 #define CTYPE_ARRAY(ValueType,NumsDims)                                \   
     98#define CTYPE_ARRAY(ValueType,NumsDims)                                \ 
    9999  template<>                                                           \ 
    100100  size_t CType< ARRAY(ValueType,NumsDims)>::size() const                           \ 
Note: See TracChangeset for help on using the changeset viewer.