Changeset 1545 for XIOS/dev/branch_openmp/src/interface/c
- Timestamp:
- 06/18/18 20:32:55 (6 years ago)
- Location:
- XIOS/dev/branch_openmp/src/interface/c
- Files:
-
- 5 added
- 24 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/branch_openmp/src/interface/c/icaxis.cpp
r591 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include < boost/shared_ptr.hpp>6 #include <memory> 7 7 8 8 #include "xios.hpp" -
XIOS/dev/branch_openmp/src/interface/c/iccalendar.cpp
r704 r1545 24 24 CTimer::get("XIOS").resume(); 25 25 const xios::CContext* context = CContext::getCurrent(); 26 const boost::shared_ptr<xios::CCalendar> cal = context->getCalendar();26 const std::shared_ptr<xios::CCalendar> cal = context->getCalendar(); 27 27 if (!cal) 28 28 ERROR("void cxios_get_current_date(cxios_date* current_date_c)", … … 41 41 { 42 42 CTimer::get("XIOS").resume(); 43 const boost::shared_ptr<xios::CCalendar> cal = CContext::getCurrent()->getCalendar();43 const std::shared_ptr<xios::CCalendar> cal = CContext::getCurrent()->getCalendar(); 44 44 if (!cal) 45 45 ERROR("int cxios_get_year_length_in_seconds(int year)", … … 54 54 { 55 55 CTimer::get("XIOS").resume(); 56 const boost::shared_ptr<xios::CCalendar> cal = CContext::getCurrent()->getCalendar();56 const std::shared_ptr<xios::CCalendar> cal = CContext::getCurrent()->getCalendar(); 57 57 if (!cal) 58 58 ERROR("int cxios_get_day_length_in_seconds()", -
XIOS/dev/branch_openmp/src/interface/c/iccalendar_wrapper.cpp
r591 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <boost/shared_ptr.hpp> 6 7 #include <memory> 7 8 8 9 #include "xios.hpp" -
XIOS/dev/branch_openmp/src/interface/c/iccompute_connectivity_domain.cpp
r934 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <boost/shared_ptr.hpp>7 6 8 7 #include "xios.hpp" -
XIOS/dev/branch_openmp/src/interface/c/iccontext.cpp
r591 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <boost/shared_ptr.hpp> 6 7 #include <memory> 7 8 8 9 #include "xios.hpp" -
XIOS/dev/branch_openmp/src/interface/c/icdata.cpp
r1460 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include < boost/shared_ptr.hpp>6 #include <memory> 7 7 #include <string> 8 8 #include <cstring> -
XIOS/dev/branch_openmp/src/interface/c/icdate.cpp
r1482 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <boost/shared_ptr.hpp>7 6 8 7 #include "xios.hpp" … … 27 26 if (!context) 28 27 ERROR(idFunc, << "Impossible to do calendar operations: no current context available."); 29 const boost::shared_ptr<xios::CCalendar> cal = context->getCalendar();28 const std::shared_ptr<xios::CCalendar> cal = context->getCalendar(); 30 29 if (!cal) 31 30 ERROR(idFunc, << "Impossible to do calendar operations: no calendar was defined."); … … 82 81 date_c.hour, date_c.minute, date_c.second); 83 82 xios::CDuration dur( dur_c.year, dur_c.month, dur_c.day, dur_c.hour, dur_c.minute, dur_c.second, dur_c.timestep ); 83 84 84 xios::CDate res = date - dur; 85 85 return { res.getYear(), res.getMonth(), res.getDay(), res.getHour(), res.getMinute(), res.getSecond() }; -
XIOS/dev/branch_openmp/src/interface/c/icdomain.cpp
r591 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <boost/shared_ptr.hpp> 6 7 #include <memory> 7 8 8 9 #include "xios.hpp" -
XIOS/dev/branch_openmp/src/interface/c/icduration.cpp
r1482 r1545 8 8 { 9 9 xios::CDuration dur( dur_c.year, dur_c.month, dur_c.day, dur_c.hour, dur_c.minute, dur_c.second, dur_c.timestep ); 10 10 11 if (!string_copy(dur.toString(), str, str_size)) 11 12 ERROR("void cxios_duration_convert_to_string(cxios_duration dur_c, char* str, int str_size)", << "Input string is too short"); … … 27 28 xios::CDuration dur1( dur1_c.year, dur1_c.month, dur1_c.day, dur1_c.hour, dur1_c.minute, dur1_c.second, dur1_c.timestep ); 28 29 xios::CDuration dur2( dur2_c.year, dur2_c.month, dur2_c.day, dur2_c.hour, dur2_c.minute, dur2_c.second, dur2_c.timestep ); 30 29 31 xios::CDuration res = dur1 + dur2; 30 32 return { res.year, res.month, res.day, res.hour, res.minute, res.second, res.timestep }; … … 35 37 xios::CDuration dur1( dur1_c.year, dur1_c.month, dur1_c.day, dur1_c.hour, dur1_c.minute, dur1_c.second, dur1_c.timestep ); 36 38 xios::CDuration dur2( dur2_c.year, dur2_c.month, dur2_c.day, dur2_c.hour, dur2_c.minute, dur2_c.second, dur2_c.timestep ); 39 37 40 xios::CDuration res = dur1 - dur2; 38 41 return { res.year, res.month, res.day, res.hour, res.minute, res.second, res.timestep }; -
XIOS/dev/branch_openmp/src/interface/c/icexpand_domain.cpp
r981 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <boost/shared_ptr.hpp> 6 7 #include <memory> 7 8 8 9 #include "xios.hpp" -
XIOS/dev/branch_openmp/src/interface/c/icextract_to_axis.cpp
r981 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include < boost/shared_ptr.hpp>6 #include <memory> 7 7 8 8 #include "xios.hpp" -
XIOS/dev/branch_openmp/src/interface/c/icextract_to_scalar.cpp
r981 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include < boost/shared_ptr.hpp>6 #include <memory> 7 7 8 8 #include "xios.hpp" -
XIOS/dev/branch_openmp/src/interface/c/icfield.cpp
r1119 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <boost/shared_ptr.hpp> 6 7 #include <memory> 7 8 8 9 #include "xios.hpp" -
XIOS/dev/branch_openmp/src/interface/c/icfile.cpp
r591 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include < boost/shared_ptr.hpp>6 #include <memory> 7 7 8 8 #include "xios.hpp" -
XIOS/dev/branch_openmp/src/interface/c/icgenerate_rectilinear_domain.cpp
r786 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <boost/shared_ptr.hpp> 6 7 #include <memory> 7 8 8 9 #include "xios.hpp" -
XIOS/dev/branch_openmp/src/interface/c/icgrid.cpp
r591 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <boost/shared_ptr.hpp>7 6 8 7 #include "xios.hpp" -
XIOS/dev/branch_openmp/src/interface/c/icinterpolate.cpp
r786 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <boost/shared_ptr.hpp>7 6 8 7 #include "xios.hpp" -
XIOS/dev/branch_openmp/src/interface/c/icinverse_axis.cpp
r786 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <boost/shared_ptr.hpp> 6 7 #include <memory> 7 8 8 9 #include "xios.hpp" -
XIOS/dev/branch_openmp/src/interface/c/icreduce_to_axis.cpp
r981 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <boost/shared_ptr.hpp> 6 7 #include <memory> 7 8 8 9 #include "xios.hpp" -
XIOS/dev/branch_openmp/src/interface/c/icreduce_to_scalar.cpp
r981 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <boost/shared_ptr.hpp>7 6 8 7 #include "xios.hpp" -
XIOS/dev/branch_openmp/src/interface/c/icscalar.cpp
r891 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include < boost/shared_ptr.hpp>6 #include <memory> 7 7 8 8 #include "xios.hpp" -
XIOS/dev/branch_openmp/src/interface/c/icvariable.cpp
r591 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <boost/shared_ptr.hpp> 6 7 #include <memory> 7 8 8 9 #include "xios.hpp" -
XIOS/dev/branch_openmp/src/interface/c/icxml_tree.cpp
r981 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include < boost/shared_ptr.hpp>6 #include <memory> 7 7 8 8 #include "xios.hpp" -
XIOS/dev/branch_openmp/src/interface/c/iczoom.cpp
r786 r1545 4 4 5 5 #include <boost/multi_array.hpp> 6 #include <boost/shared_ptr.hpp> 6 7 #include <memory> 7 8 8 9 #include "xios.hpp"
Note: See TracChangeset
for help on using the changeset viewer.