Index: /issm/trunk/src/c/objects/Results/PetscVecResult.cpp =================================================================== --- /issm/trunk/src/c/objects/Results/PetscVecResult.cpp (revision 3945) +++ /issm/trunk/src/c/objects/Results/PetscVecResult.cpp (revision 3945) @@ -0,0 +1,230 @@ +/*!\file PetscVecResult.c + * \brief: implementation of the PetscVecResult object + */ + +/*header files: */ +/*{{{1*/ +#ifdef HAVE_CONFIG_H + #include "config.h" +#else +#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +#endif + +#include "stdio.h" +#include +#include "../objects.h" +#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/shared.h" +#include "../../DataSet/DataSet.h" +#include "../../include/include.h" +/*}}}*/ + +/*Object constructors and destructor*/ +/*FUNCTION PetscVecResult::PetscVecResult(){{{1*/ +PetscVecResult::PetscVecResult(){ + return; +} +/*}}}*/ +/*FUNCTION PetscVecResult::PetscVecResult(int id, int enum_type,double time, int step, double* value,int M){{{1*/ +PetscVecResult::PetscVecResult(int in_id, int in_enum_type,double in_time, int in_step, Vec in_value){ + + id=in_id; + enum_type=in_enum_type; + time=in_time; + step=in_step; + + if(in_value){ + VecDuplicate(in_value,&value); + VecCopy(in_value,value); + } +} +/*}}}*/ +/*FUNCTION PetscVecResult::~PetscVecResult(){{{1*/ +PetscVecResult::~PetscVecResult(){ + VecFree(&value); +} +/*}}}*/ + +/*Object methods*/ +/*FUNCTION PetscVecResult::copy{{{1*/ +Object* PetscVecResult::copy() { + + return new PetscVecResult(this->id,this->enum_type,this->time,this->step,this->value); + +} +/*}}}*/ +/*FUNCTION PetscVecResult::DeepEcho{{{1*/ +void PetscVecResult::DeepEcho(void){ + + int i; + + printf("PetscVecResult echo:\n"); + printf(" id: %i \n",this->id); + printf(" enum: %i (%s)\n",this->enum_type,EnumAsString(this->enum_type)); + printf(" time: %g \n",this->time); + printf(" step: %i \n",this->step); + VecView(value,PETSC_VIEWER_STDOUT_WORLD); +} +/*}}}*/ +/*FUNCTION PetscVecResult::Demarshall{{{1*/ +void PetscVecResult::Demarshall(char** pmarshalled_dataset){ + + int i; + char* marshalled_dataset=NULL; + int M; + double* serial_vec=NULL; + int* idxm=NULL; + + /*recover marshalled_dataset: */ + marshalled_dataset=*pmarshalled_dataset; + + /*this time, no need to get enum value, the pointer directly points to the beginning of the + *object data (thanks to DataSet::Demarshall):*/ + memcpy(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id); + memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); + memcpy(&time,marshalled_dataset,sizeof(time));marshalled_dataset+=sizeof(time); + memcpy(&step,marshalled_dataset,sizeof(step));marshalled_dataset+=sizeof(step); + + memcpy(&M,marshalled_dataset,sizeof(M));marshalled_dataset+=sizeof(M); + if(M){ + serial_vec=(double*)xmalloc(M*sizeof(double)); + memcpy(serial_vec,marshalled_dataset,M*sizeof(double));marshalled_dataset+=(M*sizeof(double)); + + value=NewVec(M); + idxm=(int*)xmalloc(M*sizeof(int)); + for(i=0;iid); + printf(" enum: %i (%s)\n",this->enum_type,EnumAsString(this->enum_type)); + printf(" time: %g \n",this->time); + printf(" step: %i \n",this->step); + printf(" vector size: %i\n",M); + +} +/*}}}*/ +/*FUNCTION PetscVecResult::Enum{{{1*/ +int PetscVecResult::Enum(void){ + + return PetscVecResultEnum; + +} +/*}}}*/ +/*FUNCTION PetscVecResult::Id{{{1*/ +int PetscVecResult::Id(void){ return this->id; } +/*}}}*/ +/*FUNCTION PetscVecResult::Marshall{{{1*/ +void PetscVecResult::Marshall(char** pmarshalled_dataset){ + + char* marshalled_dataset=NULL; + int enum_value=0; + int M; + double* serial_value=NULL; + + /*recover marshalled_dataset: */ + marshalled_dataset=*pmarshalled_dataset; + + /*get enum value of PetscVecResult: */ + enum_value=PetscVecResultEnum; + + /*marshall enum: */ + memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); + + /*marshall PetscVecResult data: */ + memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id); + memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); + memcpy(marshalled_dataset,&time,sizeof(time));marshalled_dataset+=sizeof(time); + memcpy(marshalled_dataset,&step,sizeof(step));marshalled_dataset+=sizeof(step); + + if(value){ + VecGetSize(value,&M); + VecToMPISerial(&serial_value,value); + memcpy(marshalled_dataset,&M,sizeof(M));marshalled_dataset+=sizeof(M); + memcpy(marshalled_dataset,serial_value,M*sizeof(double));marshalled_dataset+=(M*sizeof(double)); + } + else{ + M=0; + memcpy(marshalled_dataset,&M,sizeof(M));marshalled_dataset+=sizeof(M); + } + + /*Free ressources:*/ + xfree((void**)&serial_value); + + *pmarshalled_dataset=marshalled_dataset; +} +/*}}}*/ +/*FUNCTION PetscVecResult::MarshallSize{{{1*/ +int PetscVecResult::MarshallSize(){ + + int M=0; + if(value)VecGetSize(value,&M); + + return sizeof(id)+ + sizeof(enum_type)+ + sizeof(time)+ + sizeof(step)+ + sizeof(M)+ + M*sizeof(double)+ + sizeof(int); //sizeof(int) for enum value +} +/*}}}*/ +/*FUNCTION PetscVecResult::MyRank{{{1*/ +int PetscVecResult::MyRank(void){ + extern int my_rank; + return my_rank; +} +/*}}}*/ +/*FUNCTION PetscVecResult::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/ +void PetscVecResult::UpdateInputsFromVector(double* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION PetscVecResult::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/ +void PetscVecResult::UpdateInputsFromVector(int* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION PetscVecResult::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/ +void PetscVecResult::UpdateInputsFromVector(bool* vector, int name, int type){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION PetscVecResult::UpdateInputsFromConstant(double constant, int name) {{{1*/ +void PetscVecResult::UpdateInputsFromConstant(double constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION PetscVecResult::UpdateInputsFromConstant(int constant, int name) {{{1*/ +void PetscVecResult::UpdateInputsFromConstant(int constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ +/*FUNCTION PetscVecResult::UpdateInputsFromConstant(bool constant, int name) {{{1*/ +void PetscVecResult::UpdateInputsFromConstant(bool constant, int name){ + /*Nothing updated yet*/ +} +/*}}}*/ Index: /issm/trunk/src/c/objects/Results/PetscVecResult.h =================================================================== --- /issm/trunk/src/c/objects/Results/PetscVecResult.h (revision 3945) +++ /issm/trunk/src/c/objects/Results/PetscVecResult.h (revision 3945) @@ -0,0 +1,68 @@ +/*! \file PetscVecResult.h + * \brief: header file for Vec result object + */ + + +#ifndef _PETSCVECRESULT_H_ +#define _PETSCVECRESULT_H_ + +/*Headers:*/ +/*{{{1*/ + +#ifdef HAVE_CONFIG_H + #include "config.h" +#else +#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +#endif + +#ifdef _SERIAL_ +#include +#endif + + +#include "./Result.h" +#include "../../include/include.h" +#include "../../shared/shared.h" +#include "../../include/include.h" +#include "../../include/include.h" +/*}}}*/ + +class PetscVecResult: public Result{ + + private: + int id; + int enum_type; + double time; + int step; + + Vec value; + + public: + /*constructors, destructors: {{{1*/ + PetscVecResult(); + PetscVecResult(int id, int enum_type,double time, int step, Vec value); + ~PetscVecResult(); + /*}}}*/ + /*Object methods: {{{1*/ + Object* copy(); + void DeepEcho(); + void Demarshall(char** pmarshalled_dataset); + void Echo(); + int Enum(); + int Id(); + void Marshall(char** pmarshalled_dataset); + int MarshallSize(); + int MyRank(); + + void UpdateInputsFromVector(double* vector, int name, int type); + void UpdateInputsFromVector(int* vector, int name, int type); + void UpdateInputsFromVector(bool* vector, int name, int type); + void UpdateInputsFromConstant(double constant, int name); + void UpdateInputsFromConstant(int constant, int name); + void UpdateInputsFromConstant(bool constant, int name); + void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} + /*}}}*/ + /*Result methods: {{{1*/ + /*}}}*/ +}; +#endif /* _PETSCVECRESULT_H */ Index: sm/trunk/src/c/objects/Results/VecResult.cpp =================================================================== --- /issm/trunk/src/c/objects/Results/VecResult.cpp (revision 3944) +++ (revision ) @@ -1,191 +1,0 @@ -/*!\file DoubleVecResult.c - * \brief: implementation of the DoubleVecResult object - */ - -/*header files: */ -/*{{{1*/ -#ifdef HAVE_CONFIG_H - #include "config.h" -#else -#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#include "stdio.h" -#include -#include "../objects.h" -#include "../../EnumDefinitions/EnumDefinitions.h" -#include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" -#include "../../include/include.h" -/*}}}*/ - -/*Object constructors and destructor*/ -/*FUNCTION DoubleVecResult::DoubleVecResult(){{{1*/ -DoubleVecResult::DoubleVecResult(){ - return; -} -/*}}}*/ -/*FUNCTION DoubleVecResult::DoubleVecResult(int id, int enum_type,double time, int step, double* value,int M){{{1*/ -DoubleVecResult::DoubleVecResult(int in_id, int in_enum_type,double in_time, int in_step, double* in_value,int in_M){ - - id=in_id; - enum_type=in_enum_type; - time=in_time; - step=in_step; - - M=in_M; - value=(double*)xmalloc(M*sizeof(double)); - memcpy(value,in_value,M*sizeof(double)); -} -/*}}}*/ -/*FUNCTION DoubleVecResult::~DoubleVecResult(){{{1*/ -DoubleVecResult::~DoubleVecResult(){ - xfree((void**)&value); - return; -} -/*}}}*/ - -/*Object methods*/ -/*FUNCTION DoubleVecResult::copy{{{1*/ -Object* DoubleVecResult::copy() { - - return new DoubleVecResult(this->id,this->enum_type,this->time,this->step,this->value,this->M); - -} -/*}}}*/ -/*FUNCTION DoubleVecResult::DeepEcho{{{1*/ -void DoubleVecResult::DeepEcho(void){ - - int i; - - printf("DoubleVecResult echo:\n"); - printf(" id: %i \n",this->id); - printf(" enum: %i (%s)\n",this->enum_type,EnumAsString(this->enum_type)); - printf(" time: %g \n",this->time); - printf(" step: %i \n",this->step); - printf(" vector size: %i\n",this->M); - for(i=0;iM;i++){ - printf("%i %g\n",i,this->value[i]); - } -} -/*}}}*/ -/*FUNCTION DoubleVecResult::Demarshall{{{1*/ -void DoubleVecResult::Demarshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int i; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*this time, no need to get enum value, the pointer directly points to the beginning of the - *object data (thanks to DataSet::Demarshall):*/ - memcpy(&id,marshalled_dataset,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(&enum_type,marshalled_dataset,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(&time,marshalled_dataset,sizeof(time));marshalled_dataset+=sizeof(time); - memcpy(&step,marshalled_dataset,sizeof(step));marshalled_dataset+=sizeof(step); - memcpy(&M,marshalled_dataset,sizeof(M));marshalled_dataset+=sizeof(M); - value=(double*)xmalloc(M*sizeof(double)); - memcpy(value,marshalled_dataset,M*sizeof(double));marshalled_dataset+=M*sizeof(double); - - /*return: */ - *pmarshalled_dataset=marshalled_dataset; - return; -} -/*}}}*/ -/*FUNCTION DoubleVecResult::Echo {{{1*/ -void DoubleVecResult::Echo(void){ - - printf("DoubleVecResult echo:\n"); - printf(" id: %i \n",this->id); - printf(" enum: %i (%s)\n",this->enum_type,EnumAsString(this->enum_type)); - printf(" time: %g \n",this->time); - printf(" step: %i \n",this->step); - printf(" vector size: %i\n",this->M); - -} -/*}}}*/ -/*FUNCTION DoubleVecResult::Enum{{{1*/ -int DoubleVecResult::Enum(void){ - - return DoubleVecResultEnum; - -} -/*}}}*/ -/*FUNCTION DoubleVecResult::Id{{{1*/ -int DoubleVecResult::Id(void){ return this->id; } -/*}}}*/ -/*FUNCTION DoubleVecResult::Marshall{{{1*/ -void DoubleVecResult::Marshall(char** pmarshalled_dataset){ - - char* marshalled_dataset=NULL; - int enum_value=0; - - /*recover marshalled_dataset: */ - marshalled_dataset=*pmarshalled_dataset; - - /*get enum value of DoubleVecResult: */ - enum_value=DoubleVecResultEnum; - - /*marshall enum: */ - memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value); - - /*marshall DoubleVecResult data: */ - memcpy(marshalled_dataset,&id,sizeof(id));marshalled_dataset+=sizeof(id); - memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type); - memcpy(marshalled_dataset,&time,sizeof(time));marshalled_dataset+=sizeof(time); - memcpy(marshalled_dataset,&step,sizeof(step));marshalled_dataset+=sizeof(step); - memcpy(marshalled_dataset,&M,sizeof(M));marshalled_dataset+=sizeof(M); - memcpy(marshalled_dataset,value,M*sizeof(double));marshalled_dataset+=M*sizeof(double); - - *pmarshalled_dataset=marshalled_dataset; -} -/*}}}*/ -/*FUNCTION DoubleVecResult::MarshallSize{{{1*/ -int DoubleVecResult::MarshallSize(){ - - return sizeof(id)+ - +sizeof(enum_type)+ - +sizeof(time)+ - +sizeof(step)+ - sizeof(M) - +M*sizeof(double) - +sizeof(int); //sizeof(int) for enum value -} -/*}}}*/ -/*FUNCTION DoubleVecResult::MyRank{{{1*/ -int DoubleVecResult::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ -/*FUNCTION DoubleVecResult::UpdateInputsFromVector(double* vector, int name, int type) {{{1*/ -void DoubleVecResult::UpdateInputsFromVector(double* vector, int name, int type){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION DoubleVecResult::UpdateInputsFromVector(int* vector, int name, int type) {{{1*/ -void DoubleVecResult::UpdateInputsFromVector(int* vector, int name, int type){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION DoubleVecResult::UpdateInputsFromVector(bool* vector, int name, int type) {{{1*/ -void DoubleVecResult::UpdateInputsFromVector(bool* vector, int name, int type){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION DoubleVecResult::UpdateInputsFromConstant(double constant, int name) {{{1*/ -void DoubleVecResult::UpdateInputsFromConstant(double constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION DoubleVecResult::UpdateInputsFromConstant(int constant, int name) {{{1*/ -void DoubleVecResult::UpdateInputsFromConstant(int constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ -/*FUNCTION DoubleVecResult::UpdateInputsFromConstant(bool constant, int name) {{{1*/ -void DoubleVecResult::UpdateInputsFromConstant(bool constant, int name){ - /*Nothing updated yet*/ -} -/*}}}*/ Index: sm/trunk/src/c/objects/Results/VecResult.h =================================================================== --- /issm/trunk/src/c/objects/Results/VecResult.h (revision 3944) +++ (revision ) @@ -1,69 +1,0 @@ -/*! \file VecResult.h - * \brief: header file for Vec result object - */ - - -#ifndef _VECRESULT_H_ -#define _VECRESULT_H_ - -/*Headers:*/ -/*{{{1*/ - -#ifdef HAVE_CONFIG_H - #include "config.h" -#else -#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#ifdef _SERIAL_ -#include -#endif - - -#include "./Result.h" -#include "../../include/include.h" -#include "../../shared/shared.h" -#include "../../include/include.h" -#include "../../include/include.h" -/*}}}*/ - -class VecResult: public Result{ - - private: - int id; - int enum_type; - double time; - int step; - - double* value; - int M; - - public: - /*constructors, destructors: {{{1*/ - VecResult(); - VecResult(int id, int enum_type,double time, int step, double* value,int M); - ~VecResult(); - /*}}}*/ - /*Object methods: {{{1*/ - Object* copy(); - void DeepEcho(); - void Demarshall(char** pmarshalled_dataset); - void Echo(); - int Enum(); - int Id(); - void Marshall(char** pmarshalled_dataset); - int MarshallSize(); - int MyRank(); - - void UpdateInputsFromVector(double* vector, int name, int type); - void UpdateInputsFromVector(int* vector, int name, int type); - void UpdateInputsFromVector(bool* vector, int name, int type); - void UpdateInputsFromConstant(double constant, int name); - void UpdateInputsFromConstant(int constant, int name); - void UpdateInputsFromConstant(bool constant, int name); - void UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){ISSMERROR("Not implemented yet!");} - /*}}}*/ - /*Result methods: {{{1*/ - /*}}}*/ -}; -#endif /* _VECRESULT_H */