From 690c822ef5b9a2f352434b1d1a50518368589b4b Mon Sep 17 00:00:00 2001 From: ageay Date: Mon, 3 Jan 2011 15:31:22 +0000 Subject: [PATCH] *** empty log message *** --- src/MEDCoupling/MEDCouplingFieldDouble.hxx | 6 ++++ .../MEDCouplingTimeDiscretization.cxx | 30 +++++++++++++++++ .../MEDCouplingTimeDiscretization.hxx | 33 +++++++++++++++++++ src/MEDCoupling_Swig/MEDCoupling.i | 6 ++++ 4 files changed, 75 insertions(+) diff --git a/src/MEDCoupling/MEDCouplingFieldDouble.hxx b/src/MEDCoupling/MEDCouplingFieldDouble.hxx index e647a2af4..6c4a7c0b7 100644 --- a/src/MEDCoupling/MEDCouplingFieldDouble.hxx +++ b/src/MEDCoupling/MEDCouplingFieldDouble.hxx @@ -60,6 +60,12 @@ namespace ParaMEDMEM void setNature(NatureOfField nat) throw(INTERP_KERNEL::Exception); void setTimeTolerance(double val) { _time_discr->setTimeTolerance(val); } double getTimeTolerance() const { return _time_discr->getTimeTolerance(); } + void setIteration(int it) throw(INTERP_KERNEL::Exception) { _time_discr->setIteration(it); } + void setEndIteration(int it) throw(INTERP_KERNEL::Exception) { _time_discr->setEndIteration(it); } + void setOrder(int order) throw(INTERP_KERNEL::Exception) { _time_discr->setOrder(order); } + void setEndOrder(int order) throw(INTERP_KERNEL::Exception) { _time_discr->setEndOrder(order); } + void setTimeValue(double val) throw(INTERP_KERNEL::Exception) { _time_discr->setTimeValue(val); } + void setEndTimeValue(double val) throw(INTERP_KERNEL::Exception) { _time_discr->setEndTimeValue(val); } void setTime(double val, int iteration, int order) { _time_discr->setTime(val,iteration,order); } void setStartTime(double val, int iteration, int order) { _time_discr->setStartTime(val,iteration,order); } void setEndTime(double val, int iteration, int order) { _time_discr->setEndTime(val,iteration,order); } diff --git a/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx b/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx index ca03fa009..057e350e4 100644 --- a/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx +++ b/src/MEDCoupling/MEDCouplingTimeDiscretization.cxx @@ -979,6 +979,36 @@ double MEDCouplingNoTimeLabel::getEndTime(int& iteration, int& order) const thro throw INTERP_KERNEL::Exception(EXCEPTION_MSG); } +void MEDCouplingNoTimeLabel::setStartIteration(int it) throw(INTERP_KERNEL::Exception) +{ + throw INTERP_KERNEL::Exception(EXCEPTION_MSG); +} + +void MEDCouplingNoTimeLabel::setEndIteration(int it) throw(INTERP_KERNEL::Exception) +{ + throw INTERP_KERNEL::Exception(EXCEPTION_MSG); +} + +void MEDCouplingNoTimeLabel::setStartOrder(int order) throw(INTERP_KERNEL::Exception) +{ + throw INTERP_KERNEL::Exception(EXCEPTION_MSG); +} + +void MEDCouplingNoTimeLabel::setEndOrder(int order) throw(INTERP_KERNEL::Exception) +{ + throw INTERP_KERNEL::Exception(EXCEPTION_MSG); +} + +void MEDCouplingNoTimeLabel::setStartTimeValue(double time) throw(INTERP_KERNEL::Exception) +{ + throw INTERP_KERNEL::Exception(EXCEPTION_MSG); +} + +void MEDCouplingNoTimeLabel::setEndTimeValue(double time) throw(INTERP_KERNEL::Exception) +{ + throw INTERP_KERNEL::Exception(EXCEPTION_MSG); +} + void MEDCouplingNoTimeLabel::setStartTime(double time, int iteration, int order) throw(INTERP_KERNEL::Exception) { throw INTERP_KERNEL::Exception(EXCEPTION_MSG); diff --git a/src/MEDCoupling/MEDCouplingTimeDiscretization.hxx b/src/MEDCoupling/MEDCouplingTimeDiscretization.hxx index 88b020eb1..de9fff53a 100644 --- a/src/MEDCoupling/MEDCouplingTimeDiscretization.hxx +++ b/src/MEDCoupling/MEDCouplingTimeDiscretization.hxx @@ -93,6 +93,15 @@ namespace ParaMEDMEM virtual double getStartTime(int& iteration, int& order) const throw(INTERP_KERNEL::Exception) = 0; virtual double getEndTime(int& iteration, int& order) const throw(INTERP_KERNEL::Exception) = 0; void setTime(double time, int iteration, int order) throw(INTERP_KERNEL::Exception) { setStartTime(time,iteration,order); } + void setIteration(int it) throw(INTERP_KERNEL::Exception) { setStartIteration(it); } + void setOrder(int order) throw(INTERP_KERNEL::Exception) { setStartOrder(order); } + void setTimeValue(double val) throw(INTERP_KERNEL::Exception) { setStartTimeValue(val); } + virtual void setStartIteration(int it) throw(INTERP_KERNEL::Exception) = 0; + virtual void setEndIteration(int it) throw(INTERP_KERNEL::Exception) = 0; + virtual void setStartOrder(int order) throw(INTERP_KERNEL::Exception) = 0; + virtual void setEndOrder(int order) throw(INTERP_KERNEL::Exception) = 0; + virtual void setStartTimeValue(double time) throw(INTERP_KERNEL::Exception) = 0; + virtual void setEndTimeValue(double time) throw(INTERP_KERNEL::Exception) = 0; virtual void setStartTime(double time, int iteration, int order) throw(INTERP_KERNEL::Exception) = 0; virtual void setEndTime(double time, int iteration, int order) throw(INTERP_KERNEL::Exception) = 0; virtual void getValueOnTime(int eltId, double time, double *value) const throw(INTERP_KERNEL::Exception) = 0; @@ -167,6 +176,12 @@ namespace ParaMEDMEM bool isStrictlyBefore(const MEDCouplingTimeDiscretization *other) const throw(INTERP_KERNEL::Exception); double getStartTime(int& iteration, int& order) const throw(INTERP_KERNEL::Exception); double getEndTime(int& iteration, int& order) const throw(INTERP_KERNEL::Exception); + void setStartIteration(int it) throw(INTERP_KERNEL::Exception); + void setEndIteration(int it) throw(INTERP_KERNEL::Exception); + void setStartOrder(int order) throw(INTERP_KERNEL::Exception); + void setEndOrder(int order) throw(INTERP_KERNEL::Exception); + void setStartTimeValue(double time) throw(INTERP_KERNEL::Exception); + void setEndTimeValue(double time) throw(INTERP_KERNEL::Exception); void setStartTime(double time, int iteration, int order) throw(INTERP_KERNEL::Exception); void setEndTime(double time, int iteration, int order) throw(INTERP_KERNEL::Exception); void getValueOnTime(int eltId, double time, double *value) const throw(INTERP_KERNEL::Exception); @@ -219,6 +234,12 @@ namespace ParaMEDMEM void setEndTime(double time, int iteration, int order) throw(INTERP_KERNEL::Exception) { _time=time; _iteration=iteration; _order=order; } double getStartTime(int& iteration, int& order) const throw(INTERP_KERNEL::Exception) { iteration=_iteration; order=_order; return _time; } double getEndTime(int& iteration, int& order) const throw(INTERP_KERNEL::Exception) { iteration=_iteration; order=_order; return _time; } + void setStartIteration(int it) throw(INTERP_KERNEL::Exception) { _iteration=it; } + void setEndIteration(int it) throw(INTERP_KERNEL::Exception) { _iteration=it; } + void setStartOrder(int order) throw(INTERP_KERNEL::Exception) { _order=order; } + void setEndOrder(int order) throw(INTERP_KERNEL::Exception) { _order=order; } + void setStartTimeValue(double time) throw(INTERP_KERNEL::Exception) { _time=time; } + void setEndTimeValue(double time) throw(INTERP_KERNEL::Exception) { _time=time; } std::vector< const DataArrayDouble *> getArraysForTime(double time) const throw(INTERP_KERNEL::Exception); void getValueForTime(double time, const std::vector& vals, double *res) const; void getValueOnTime(int eltId, double time, double *value) const throw(INTERP_KERNEL::Exception); @@ -277,6 +298,12 @@ namespace ParaMEDMEM void setEndTime(double time, int iteration, int order) throw(INTERP_KERNEL::Exception) { _end_time=time; _end_iteration=iteration; _end_order=order; } double getStartTime(int& iteration, int& order) const throw(INTERP_KERNEL::Exception) { iteration=_start_iteration; order=_start_order; return _start_time; } double getEndTime(int& iteration, int& order) const throw(INTERP_KERNEL::Exception) { iteration=_end_iteration; order=_end_order; return _end_time; } + void setStartIteration(int it) throw(INTERP_KERNEL::Exception) { _start_iteration=it; } + void setEndIteration(int it) throw(INTERP_KERNEL::Exception) { _end_iteration=it; } + void setStartOrder(int order) throw(INTERP_KERNEL::Exception) { _start_order=order; } + void setEndOrder(int order) throw(INTERP_KERNEL::Exception) { _end_order=order; } + void setStartTimeValue(double time) throw(INTERP_KERNEL::Exception) { _start_time=time; } + void setEndTimeValue(double time) throw(INTERP_KERNEL::Exception) { _end_time=time; } void checkNoTimePresence() const throw(INTERP_KERNEL::Exception); void checkTimePresence(double time) const throw(INTERP_KERNEL::Exception); public: @@ -315,6 +342,12 @@ namespace ParaMEDMEM void setEndTime(double time, int iteration, int order) throw(INTERP_KERNEL::Exception) { _end_time=time; _end_iteration=iteration; _end_order=order; } double getStartTime(int& iteration, int& order) const throw(INTERP_KERNEL::Exception) { iteration=_start_iteration; order=_start_order; return _start_time; } double getEndTime(int& iteration, int& order) const throw(INTERP_KERNEL::Exception) { iteration=_end_iteration; order=_end_order; return _end_time; } + void setStartIteration(int it) throw(INTERP_KERNEL::Exception) { _start_iteration=it; } + void setEndIteration(int it) throw(INTERP_KERNEL::Exception) { _end_iteration=it; } + void setStartOrder(int order) throw(INTERP_KERNEL::Exception) { _start_order=order; } + void setEndOrder(int order) throw(INTERP_KERNEL::Exception) { _end_order=order; } + void setStartTimeValue(double time) throw(INTERP_KERNEL::Exception) { _start_time=time; } + void setEndTimeValue(double time) throw(INTERP_KERNEL::Exception) { _end_time=time; } void getTinySerializationIntInformation(std::vector& tinyInfo) const; void getTinySerializationDbleInformation(std::vector& tinyInfo) const; void getTinySerializationStrInformation(std::vector& tinyInfo) const; diff --git a/src/MEDCoupling_Swig/MEDCoupling.i b/src/MEDCoupling_Swig/MEDCoupling.i index 3222ad870..1cd5b1737 100644 --- a/src/MEDCoupling_Swig/MEDCoupling.i +++ b/src/MEDCoupling_Swig/MEDCoupling.i @@ -1427,6 +1427,12 @@ namespace ParaMEDMEM void setNature(NatureOfField nat) throw(INTERP_KERNEL::Exception); void setTimeTolerance(double val) throw(INTERP_KERNEL::Exception); double getTimeTolerance() const throw(INTERP_KERNEL::Exception); + void setIteration(int it) throw(INTERP_KERNEL::Exception); + void setEndIteration(int it) throw(INTERP_KERNEL::Exception); + void setOrder(int order) throw(INTERP_KERNEL::Exception); + void setEndOrder(int order) throw(INTERP_KERNEL::Exception); + void setTimeValue(double val) throw(INTERP_KERNEL::Exception); + void setEndTimeValue(double val) throw(INTERP_KERNEL::Exception); void updateTime() throw(INTERP_KERNEL::Exception); void changeUnderlyingMesh(const MEDCouplingMesh *other, int levOfCheck, double prec) throw(INTERP_KERNEL::Exception); void substractInPlaceDM(const MEDCouplingFieldDouble *f, int levOfCheck, double prec) throw(INTERP_KERNEL::Exception); -- 2.39.2