Changeset 335 for XIOS/trunk/src/interface
- Timestamp:
- 03/30/12 15:37:54 (12 years ago)
- Location:
- XIOS/trunk/src/interface
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/interface/c/icaxis.cpp
r325 r335 1 1 /* ************************************************************************** * 2 * Copyright © IPSL/LSCE, XMLIOServer, Avril 2010 - Octobre 2011 *2 * Copyright © IPSL/LSCE, xios, Avril 2010 - Octobre 2011 * 3 3 * ************************************************************************** */ 4 4 … … 20 20 // ----------------------- Redéfinition de types ---------------------------- 21 21 22 typedef x mlioserver::tree::CAxis * XAxisPtr;23 typedef x mlioserver::tree::CAxisGroup * XAxisGroupPtr;22 typedef xios::tree::CAxis * XAxisPtr; 23 typedef xios::tree::CAxisGroup * XAxisGroupPtr; 24 24 25 25 // ------------------------ Création des handle ----------------------------- … … 30 30 if (!cstr2string(_id, _id_len, id)) return; 31 31 32 *_ret = x mlioserver::CObjectFactory::GetObject<xmlioserver::tree::CAxis>(id).get();32 *_ret = xios::CObjectFactory::GetObject<xios::tree::CAxis>(id).get(); 33 33 } 34 34 … … 38 38 if (!cstr2string(_id, _id_len, id)) return; 39 39 40 *_ret = x mlioserver::CObjectFactory::GetObject<xmlioserver::tree::CAxisGroup>(id).get();40 *_ret = xios::CObjectFactory::GetObject<xios::tree::CAxisGroup>(id).get(); 41 41 } 42 42 … … 48 48 if (!cstr2string(_id, _id_len, id)) return; 49 49 50 *_ret = x mlioserver::CObjectFactory::HasObject<xmlioserver::tree::CAxis>(id);50 *_ret = xios::CObjectFactory::HasObject<xios::tree::CAxis>(id); 51 51 } 52 52 … … 56 56 if (!cstr2string(_id, _id_len, id)) return; 57 57 58 *_ret = x mlioserver::CObjectFactory::HasObject<xmlioserver::tree::CAxisGroup>(id);58 *_ret = xios::CObjectFactory::HasObject<xios::tree::CAxisGroup>(id); 59 59 } 60 60 -
XIOS/trunk/src/interface/c/iccontext.cpp
r325 r335 1 1 /* ************************************************************************** * 2 * Copyright © IPSL/LSCE, XMLIOServer, Avril 2010 - Octobre 2011 *2 * Copyright © IPSL/LSCE, xios, Avril 2010 - Octobre 2011 * 3 3 * ************************************************************************** */ 4 4 … … 24 24 typedef enum { D360 = 0 , ALLLEAP, NOLEAP, JULIAN, GREGORIAN } XCalendarType ; 25 25 26 typedef x mlioserver::tree::CContext * XContextPtr;26 typedef xios::tree::CContext * XContextPtr; 27 27 28 28 // ------------------------ Création des handle ----------------------------- … … 33 33 if (!cstr2string(_id, _id_len, id)) return; 34 34 35 std::vector<boost::shared_ptr<x mlioserver::tree::CContext> > def_vector =36 x mlioserver::tree::CContext::GetContextGroup()->getChildList();35 std::vector<boost::shared_ptr<xios::tree::CContext> > def_vector = 36 xios::tree::CContext::GetContextGroup()->getChildList(); 37 37 38 38 for (std::size_t i = 0; i < def_vector.size(); i++) … … 60 60 if (!cstr2string(_id, _id_len, id)) return; 61 61 62 std::vector<boost::shared_ptr<x mlioserver::tree::CContext> > def_vector =63 x mlioserver::tree::CContext::GetContextGroup()->getChildList();62 std::vector<boost::shared_ptr<xios::tree::CContext> > def_vector = 63 xios::tree::CContext::GetContextGroup()->getChildList(); 64 64 65 65 for (std::size_t i = 0; i < def_vector.size(); i++) -
XIOS/trunk/src/interface/c/icdata.cpp
r325 r335 1 1 /* ************************************************************************** * 2 * Copyright © IPSL/LSCE, XMLIOServer, Avril 2010 - Octobre 2011 *2 * Copyright © IPSL/LSCE, xios, Avril 2010 - Octobre 2011 * 3 3 * ************************************************************************** */ 4 4 … … 31 31 typedef enum { NETCDF4 = 0 } XFileType; 32 32 33 typedef x mlioserver::tree::CContext * XContextPtr;33 typedef xios::tree::CContext * XContextPtr; 34 34 35 35 // -------------------- Traitement des données ------------------------------ -
XIOS/trunk/src/interface/c/icdate.cpp
r325 r335 1 1 /* ************************************************************************** * 2 * Copyright © IPSL/LSCE, XMLIOServer, Avril 2010 - Octobre 2011 *2 * Copyright © IPSL/LSCE, xios, Avril 2010 - Octobre 2011 * 3 3 * ************************************************************************** */ 4 4 … … 26 26 { 27 27 date::CDuration dur = {ts_year, ts_month, ts_day, ts_hour, ts_minute, ts_second}; 28 boost::shared_ptr<x mlioserver::tree::CContext> context =29 x mlioserver::CObjectFactory::GetObject<xmlioserver::tree::CContext>28 boost::shared_ptr<xios::tree::CContext> context = 29 xios::CObjectFactory::GetObject<xios::tree::CContext> 30 30 (CObjectFactory::GetCurrentContextId()); 31 31 … … 33 33 context->sendAttributToServer("timestep") ; 34 34 } 35 catch (x mlioserver::CException & exc)35 catch (xios::CException & exc) 36 36 { 37 37 std::cerr << exc.getMessage() << std::endl; … … 42 42 void cxios_update_calendar(int step) 43 43 { 44 boost::shared_ptr<x mlioserver::tree::CContext> context =45 x mlioserver::CObjectFactory::GetObject<xmlioserver::tree::CContext>44 boost::shared_ptr<xios::tree::CContext> context = 45 xios::CObjectFactory::GetObject<xios::tree::CContext> 46 46 (CObjectFactory::GetCurrentContextId()); 47 47 context->updateCalendar(step) ; -
XIOS/trunk/src/interface/c/icdomain.cpp
r325 r335 1 1 /* ************************************************************************** * 2 * Copyright © IPSL/LSCE, XMLIOServer, Avril 2010 - Octobre 2011 *2 * Copyright © IPSL/LSCE, xios, Avril 2010 - Octobre 2011 * 3 3 * ************************************************************************** */ 4 4 … … 20 20 // ----------------------- Redéfinition de types ---------------------------- 21 21 22 typedef x mlioserver::tree::CDomain * XDomainPtr;23 typedef x mlioserver::tree::CDomainGroup * XDomainGroupPtr;22 typedef xios::tree::CDomain * XDomainPtr; 23 typedef xios::tree::CDomainGroup * XDomainGroupPtr; 24 24 25 25 // ------------------------ Création des handle ----------------------------- … … 30 30 if (!cstr2string(_id, _id_len, id)) return; 31 31 32 *_ret = x mlioserver::CObjectFactory::GetObject<xmlioserver::tree::CDomain>(id).get();32 *_ret = xios::CObjectFactory::GetObject<xios::tree::CDomain>(id).get(); 33 33 } 34 34 … … 38 38 if (!cstr2string(_id, _id_len, id)) return; 39 39 40 *_ret = x mlioserver::CObjectFactory::GetObject<xmlioserver::tree::CDomainGroup>(id).get();40 *_ret = xios::CObjectFactory::GetObject<xios::tree::CDomainGroup>(id).get(); 41 41 } 42 42 … … 48 48 if (!cstr2string(_id, _id_len, id)) return; 49 49 50 *_ret = x mlioserver::CObjectFactory::HasObject<xmlioserver::tree::CDomain>(id);50 *_ret = xios::CObjectFactory::HasObject<xios::tree::CDomain>(id); 51 51 } 52 52 … … 56 56 if (!cstr2string(_id, _id_len, id)) return; 57 57 58 *_ret = x mlioserver::CObjectFactory::HasObject<xmlioserver::tree::CDomainGroup>(id);58 *_ret = xios::CObjectFactory::HasObject<xios::tree::CDomainGroup>(id); 59 59 } 60 60 } // extern "C" -
XIOS/trunk/src/interface/c/icfield.cpp
r325 r335 1 1 /* ************************************************************************** * 2 * Copyright © IPSL/LSCE, XMLIOServer, Avril 2010 - Octobre 2011 *2 * Copyright © IPSL/LSCE, xios, Avril 2010 - Octobre 2011 * 3 3 * ************************************************************************** */ 4 4 … … 20 20 // ----------------------- Redéfinition de types ---------------------------- 21 21 22 typedef x mlioserver::tree::CField * XFieldPtr;23 typedef x mlioserver::tree::CFieldGroup * XFieldGroupPtr;22 typedef xios::tree::CField * XFieldPtr; 23 typedef xios::tree::CFieldGroup * XFieldGroupPtr; 24 24 25 25 // -------------------------------------------------------------------------- … … 32 32 if (!cstr2string(_id, _id_len, id)) return; 33 33 34 *_ret = x mlioserver::CObjectFactory::GetObject<xmlioserver::tree::CField>(id).get();34 *_ret = xios::CObjectFactory::GetObject<xios::tree::CField>(id).get(); 35 35 } 36 36 … … 40 40 if (!cstr2string(_id, _id_len, id)) return; 41 41 42 *_ret = x mlioserver::CObjectFactory::GetObject<xmlioserver::tree::CFieldGroup>(id).get();42 *_ret = xios::CObjectFactory::GetObject<xios::tree::CFieldGroup>(id).get(); 43 43 } 44 44 … … 51 51 if (!cstr2string(_id, _id_len, id)) return; 52 52 53 *_ret = x mlioserver::CObjectFactory::HasObject<xmlioserver::tree::CField>(id);53 *_ret = xios::CObjectFactory::HasObject<xios::tree::CField>(id); 54 54 } 55 55 … … 59 59 if (!cstr2string(_id, _id_len, id)) return; 60 60 61 *_ret = x mlioserver::CObjectFactory::HasObject<xmlioserver::tree::CFieldGroup>(id);61 *_ret = xios::CObjectFactory::HasObject<xios::tree::CFieldGroup>(id); 62 62 } 63 63 -
XIOS/trunk/src/interface/c/icfile.cpp
r325 r335 1 1 /* ************************************************************************** * 2 * Copyright © IPSL/LSCE, XMLIOServer, Avril 2010 - Octobre 2011 *2 * Copyright © IPSL/LSCE, xios, Avril 2010 - Octobre 2011 * 3 3 * ************************************************************************** */ 4 4 … … 20 20 // ----------------------- Redéfinition de types ---------------------------- 21 21 22 typedef x mlioserver::tree::CFile * XFilePtr;23 typedef x mlioserver::tree::CFileGroup * XFileGroupPtr;22 typedef xios::tree::CFile * XFilePtr; 23 typedef xios::tree::CFileGroup * XFileGroupPtr; 24 24 25 25 // ------------------------ Création des handle ----------------------------- … … 30 30 if (!cstr2string(_id, _id_len, id)) return; 31 31 32 *_ret = x mlioserver::CObjectFactory::GetObject<xmlioserver::tree::CFile>(id).get();32 *_ret = xios::CObjectFactory::GetObject<xios::tree::CFile>(id).get(); 33 33 } 34 34 … … 38 38 if (!cstr2string(_id, _id_len, id)) return; 39 39 40 *_ret = x mlioserver::CObjectFactory::GetObject<xmlioserver::tree::CFileGroup>(id).get();40 *_ret = xios::CObjectFactory::GetObject<xios::tree::CFileGroup>(id).get(); 41 41 } 42 42 … … 48 48 if (!cstr2string(_id, _id_len, id)) return; 49 49 50 *_ret = x mlioserver::CObjectFactory::HasObject<xmlioserver::tree::CFile>(id);50 *_ret = xios::CObjectFactory::HasObject<xios::tree::CFile>(id); 51 51 } 52 52 … … 56 56 if (!cstr2string(_id, _id_len, id)) return; 57 57 58 *_ret = x mlioserver::CObjectFactory::HasObject<xmlioserver::tree::CFileGroup>(id);58 *_ret = xios::CObjectFactory::HasObject<xios::tree::CFileGroup>(id); 59 59 } 60 60 } // extern "C" -
XIOS/trunk/src/interface/c/icgrid.cpp
r325 r335 1 1 /* ************************************************************************** * 2 * Copyright © IPSL/LSCE, XMLIOServer, Avril 2010 - Octobre 2011 *2 * Copyright © IPSL/LSCE, xios, Avril 2010 - Octobre 2011 * 3 3 * ************************************************************************** */ 4 4 … … 20 20 // ----------------------- Redéfinition de types ---------------------------- 21 21 22 typedef x mlioserver::tree::CGrid * XGridPtr;23 typedef x mlioserver::tree::CGridGroup * XGridGroupPtr;22 typedef xios::tree::CGrid * XGridPtr; 23 typedef xios::tree::CGridGroup * XGridGroupPtr; 24 24 25 25 // ------------------------ Création des handle ----------------------------- … … 30 30 if (!cstr2string(_id, _id_len, id)) return; 31 31 32 *_ret = x mlioserver::CObjectFactory::GetObject<xmlioserver::tree::CGrid>(id).get();32 *_ret = xios::CObjectFactory::GetObject<xios::tree::CGrid>(id).get(); 33 33 } 34 34 … … 38 38 if (!cstr2string(_id, _id_len, id)) return; 39 39 40 *_ret = x mlioserver::CObjectFactory::GetObject<xmlioserver::tree::CGridGroup>(id).get();40 *_ret = xios::CObjectFactory::GetObject<xios::tree::CGridGroup>(id).get(); 41 41 } 42 42 … … 48 48 if (!cstr2string(_id, _id_len, id)) return; 49 49 50 *_ret = x mlioserver::CObjectFactory::HasObject<xmlioserver::tree::CGrid>(id);50 *_ret = xios::CObjectFactory::HasObject<xios::tree::CGrid>(id); 51 51 } 52 52 … … 56 56 if (!cstr2string(_id, _id_len, id)) return; 57 57 58 *_ret = x mlioserver::CObjectFactory::HasObject<xmlioserver::tree::CGridGroup>(id);58 *_ret = xios::CObjectFactory::HasObject<xios::tree::CGridGroup>(id); 59 59 } 60 60 } // extern "C" -
XIOS/trunk/src/interface/c/icutil.hpp
r325 r335 1 1 /* ************************************************************************** * 2 * Copyright © IPSL/LSCE, XMLIOServer, Avril 2010 - Octobre 2011 *2 * Copyright © IPSL/LSCE, xios, Avril 2010 - Octobre 2011 * 3 3 * ************************************************************************** */ 4 4 -
XIOS/trunk/src/interface/c/icxml_tree.cpp
r325 r335 1 1 /* ************************************************************************** * 2 * Copyright © IPSL/LSCE, XMLIOServer, Avril 2010 - Octobre 2011 *2 * Copyright © IPSL/LSCE, xios, Avril 2010 - Octobre 2011 * 3 3 * ************************************************************************** */ 4 4 … … 20 20 // ----------------------- Redéfinition de types ---------------------------- 21 21 22 typedef x mlioserver::tree::CContext * XContextPtr;23 24 typedef x mlioserver::tree::CGrid * XGridPtr;25 typedef x mlioserver::tree::CGridGroup * XGridGroupPtr;26 27 typedef x mlioserver::tree::CFile * XFilePtr;28 typedef x mlioserver::tree::CFileGroup * XFileGroupPtr;29 30 typedef x mlioserver::tree::CField * XFieldPtr;31 typedef x mlioserver::tree::CFieldGroup * XFieldGroupPtr;32 33 typedef x mlioserver::tree::CDomain * XDomainPtr;34 typedef x mlioserver::tree::CDomainGroup * XDomainGroupPtr;35 36 typedef x mlioserver::tree::CAxis * XAxisPtr;37 typedef x mlioserver::tree::CAxisGroup * XAxisGroupPtr;22 typedef xios::tree::CContext * XContextPtr; 23 24 typedef xios::tree::CGrid * XGridPtr; 25 typedef xios::tree::CGridGroup * XGridGroupPtr; 26 27 typedef xios::tree::CFile * XFilePtr; 28 typedef xios::tree::CFileGroup * XFileGroupPtr; 29 30 typedef xios::tree::CField * XFieldPtr; 31 typedef xios::tree::CFieldGroup * XFieldGroupPtr; 32 33 typedef xios::tree::CDomain * XDomainPtr; 34 typedef xios::tree::CDomainGroup * XDomainGroupPtr; 35 36 typedef xios::tree::CAxis * XAxisPtr; 37 typedef xios::tree::CAxisGroup * XAxisGroupPtr; 38 38 39 39 // ----------------------- Ajout d'enfant à un parent ----------------------- … … 247 247 { 248 248 if (cstr2string(filename, filename_size, filename_str)) 249 x mlioserver::CTreeManager::PrintTreeToFile(filename_str);249 xios::CTreeManager::PrintTreeToFile(filename_str); 250 250 else 251 x mlioserver::CTreeManager::PrintTreeToStream(std::clog);252 } 253 catch (x mlioserver::CException & exc)251 xios::CTreeManager::PrintTreeToStream(std::clog); 252 } 253 catch (xios::CException & exc) 254 254 { 255 255 std::cerr << exc.getMessage() << std::endl; … … 268 268 try 269 269 { 270 x mlioserver::CTreeManager::ParseFile(filename_str);271 } 272 catch (x mlioserver::CException & exc)270 xios::CTreeManager::ParseFile(filename_str); 271 } 272 catch (xios::CException & exc) 273 273 { 274 274 std::cerr << exc.getMessage() << std::endl; … … 284 284 try 285 285 { 286 x mlioserver::CTreeManager::ParseString(xmlcontent_str);287 } 288 catch (x mlioserver::CException & exc)286 xios::CTreeManager::ParseString(xmlcontent_str); 287 } 288 catch (xios::CException & exc) 289 289 { 290 290 std::cerr << exc.getMessage() << std::endl; -
XIOS/trunk/src/interface/c/oasis_cinterface.cpp
r325 r335 3 3 #include <mpi.h> 4 4 5 namespace x mlioserver5 namespace xios 6 6 { 7 7 -
XIOS/trunk/src/interface/c/oasis_cinterface.hpp
r325 r335 14 14 } 15 15 16 namespace x mlioserver16 namespace xios 17 17 { 18 18 void oasis_init(const std::string& server_id) ; -
XIOS/trunk/src/interface/c_attr/icaxis_attr.cpp
r325 r335 13 13 extern "C" 14 14 { 15 typedef x mlioserver::tree::CAxis* axis_Ptr;15 typedef xios::tree::CAxis* axis_Ptr; 16 16 17 17 void cxios_set_axis_long_name(axis_Ptr axis_hdl, const char * long_name, int long_name_size) -
XIOS/trunk/src/interface/c_attr/icaxisgroup_attr.cpp
r325 r335 13 13 extern "C" 14 14 { 15 typedef x mlioserver::tree::CAxisGroup* axisgroup_Ptr;15 typedef xios::tree::CAxisGroup* axisgroup_Ptr; 16 16 17 17 void cxios_set_axisgroup_group_ref(axisgroup_Ptr axisgroup_hdl, const char * group_ref, int group_ref_size) -
XIOS/trunk/src/interface/c_attr/iccontext_attr.cpp
r325 r335 13 13 extern "C" 14 14 { 15 typedef x mlioserver::tree::CContext* context_Ptr;15 typedef xios::tree::CContext* context_Ptr; 16 16 17 17 void cxios_set_context_calendar_type(context_Ptr context_hdl, const char * calendar_type, int calendar_type_size) -
XIOS/trunk/src/interface/c_attr/icdomain_attr.cpp
r325 r335 13 13 extern "C" 14 14 { 15 typedef x mlioserver::tree::CDomain* domain_Ptr;15 typedef xios::tree::CDomain* domain_Ptr; 16 16 17 17 void cxios_set_domain_data_dim(domain_Ptr domain_hdl, int data_dim) -
XIOS/trunk/src/interface/c_attr/icdomaingroup_attr.cpp
r325 r335 13 13 extern "C" 14 14 { 15 typedef x mlioserver::tree::CDomainGroup* domaingroup_Ptr;15 typedef xios::tree::CDomainGroup* domaingroup_Ptr; 16 16 17 17 void cxios_set_domaingroup_data_dim(domaingroup_Ptr domaingroup_hdl, int data_dim) -
XIOS/trunk/src/interface/c_attr/icfield_attr.cpp
r325 r335 13 13 extern "C" 14 14 { 15 typedef x mlioserver::tree::CField* field_Ptr;15 typedef xios::tree::CField* field_Ptr; 16 16 17 17 void cxios_set_field_axis_ref(field_Ptr field_hdl, const char * axis_ref, int axis_ref_size) -
XIOS/trunk/src/interface/c_attr/icfieldgroup_attr.cpp
r325 r335 13 13 extern "C" 14 14 { 15 typedef x mlioserver::tree::CFieldGroup* fieldgroup_Ptr;15 typedef xios::tree::CFieldGroup* fieldgroup_Ptr; 16 16 17 17 void cxios_set_fieldgroup_axis_ref(fieldgroup_Ptr fieldgroup_hdl, const char * axis_ref, int axis_ref_size) -
XIOS/trunk/src/interface/c_attr/icfile_attr.cpp
r325 r335 13 13 extern "C" 14 14 { 15 typedef x mlioserver::tree::CFile* file_Ptr;15 typedef xios::tree::CFile* file_Ptr; 16 16 17 17 void cxios_set_file_description(file_Ptr file_hdl, const char * description, int description_size) -
XIOS/trunk/src/interface/c_attr/icfilegroup_attr.cpp
r325 r335 13 13 extern "C" 14 14 { 15 typedef x mlioserver::tree::CFileGroup* filegroup_Ptr;15 typedef xios::tree::CFileGroup* filegroup_Ptr; 16 16 17 17 void cxios_set_filegroup_description(filegroup_Ptr filegroup_hdl, const char * description, int description_size) -
XIOS/trunk/src/interface/c_attr/icgrid_attr.cpp
r325 r335 13 13 extern "C" 14 14 { 15 typedef x mlioserver::tree::CGrid* grid_Ptr;15 typedef xios::tree::CGrid* grid_Ptr; 16 16 17 17 void cxios_set_grid_axis_ref(grid_Ptr grid_hdl, const char * axis_ref, int axis_ref_size) -
XIOS/trunk/src/interface/c_attr/icgridgroup_attr.cpp
r325 r335 13 13 extern "C" 14 14 { 15 typedef x mlioserver::tree::CGridGroup* gridgroup_Ptr;15 typedef xios::tree::CGridGroup* gridgroup_Ptr; 16 16 17 17 void cxios_set_gridgroup_axis_ref(gridgroup_Ptr gridgroup_hdl, const char * axis_ref, int axis_ref_size)
Note: See TracChangeset
for help on using the changeset viewer.