Changeset 25580

Timestamp:

09/17/20 15:44:24 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: no need to look at type anymore for dependents

Location:

issm/trunk-jpl/src/c

Files:

• classes/DependentObject.cpp (modified) (4 diffs)
• classes/DependentObject.h (modified) (1 diff)
• modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/DependentObject.cpp

@@ -16 +16 @@
 DependentObject::DependentObject(){/*{{{*/
         this->name=NULL;
-        this->type=0;
         this->index=-1;
         this->response_value=0.;
 }
 /*}}}*/
-DependentObject::DependentObject(char* in_name, int in_type,int in_index){/*{{{*/
+DependentObject::DependentObject(char* in_name,int in_index){/*{{{*/
 
         this->name=xNew<char>(strlen(in_name)+1); xMemCpy<char>(this->name,in_name,strlen(in_name)+1);
-        this->type=in_type;
         this->index=in_index;
-        if(in_type!=0 && in_type!=1)_error_("cannot create an DependentObject of type " << in_type);
-        if(in_type==1)_error_("not implemented yet!");
         this->response_value=0.;
 
-}
-/*}}}*/
-DependentObject::DependentObject(char* in_name, int in_type,int in_index,IssmDouble in_response){/*{{{*/
+}/*}}}*/
+DependentObject::DependentObject(char* in_name,int in_index,IssmDouble in_response){/*{{{*/
 
         this->name=xNew<char>(strlen(in_name)+1); xMemCpy<char>(this->name,in_name,strlen(in_name)+1);
-        this->type=in_type;
         this->index=in_index;
-        if(in_type!=0 && in_type!=1)_error_("cannot create an DependentObject of type " << in_type);
-        if(in_type==1)_error_("not implemented yet!");
         this->response_value=in_response;
 
-}
-/*}}}*/
+}/*}}}*/
 DependentObject::~DependentObject(){ //destructor/*{{{*/
         xDelete<char>(this->name);
-}
-/*}}}*/
+}/*}}}*/
 
 /*Object virtual functions definitions:*/
 Object* DependentObject::copy(void) { /*{{{*/
-        return new DependentObject(name,type,index,response_value);
+        return new DependentObject(name,index,response_value);
 } /*}}}*/
 void DependentObject::DeepEcho(void){/*{{{*/
@@ -60 +50 @@
         _printf_("DependentObject:\n");
         _printf_("   name: " << this->name << "\n");
-        if(this->type==0)
-                _printf_("   type: scalar\n");
-        else if(this->type==1)
-                _printf_("   type: vertex\n");
-        else
-                _error_(" unknown type: " << this->type);
         if(this->index>=0) _printf_("   index: " << this->index << "\n");
+        _printf_("   value: " << this->value << "\n");
 }
 /*}}}*/
-int    DependentObject::Id(void){ return -1; }/*{{{*/
+int  DependentObject::Id(void){ return -1; }/*{{{*/
 /*}}}*/
-int DependentObject::ObjectEnum(void){/*{{{*/
+int  DependentObject::ObjectEnum(void){/*{{{*/
 
         return DependentObjectEnum;
@@ -77 +62 @@
 }
 /*}}}*/
-void    DependentObject::Marshall(MarshallHandle* marshallhandle){/*{{{*/
+void DependentObject::Marshall(MarshallHandle* marshallhandle){/*{{{*/
 
         int object_enum = DependentObjectEnum;
@@ -85 +70 @@
         marshallhandle->call(this->name);
 
-        marshallhandle->call(this->type);
         marshallhandle->call(this->index);
         marshallhandle->call(this->response_value);
-}
-/*}}}*/
+}/*}}}*/
 
 /*DependentObject methods: */
-int  DependentObject::NumDependents(void){/*{{{*/
-
-        /*Branch according to the type of variable: */
-        if(type==0){ /*scalar:*/
-                return 1;
-        }
-        else if(type==1){ /* vector:*/
-                _error_("not implemented yet!");
-        }
-        else _error_("should not have a type of " << type);
-}
-/*}}}*/
 void  DependentObject::Responsex(IssmDouble* poutput_value,FemModel* femmodel){/*{{{*/
 

issm/trunk-jpl/src/c/classes/DependentObject.h

@@ -18 +18 @@
 
                 char* name;
-                int type;  /*0: scalar, 1: vertex*/
-                int index;  /*0: scalar, 1: vertex*/
+                int   index;  /*0: scalar, 1: vertex*/
                 IssmDouble response_value;
 
                 /*DependentObject constructors, destructors */
                 DependentObject();
-                DependentObject(char* name, int type,int index);
-                DependentObject(char* name, int type,int index,IssmDouble in_response);
+                DependentObject(char* name,int index);
+                DependentObject(char* name,int index,IssmDouble in_response);
                 ~DependentObject();
 
                 /*Object virtual functions definitions*/
-                Object* copy(void);
-                void  DeepEcho();
-                void  Echo();
-                int   Id(); 
-                int   ObjectEnum();
-                void  Marshall(MarshallHandle* marshallhandle);
+                Object *copy(void);
+                void    DeepEcho();
+                void    Echo();
+                int     Id();
+                int     ObjectEnum();
+                void    Marshall(MarshallHandle  *marshallhandle);
 
                 /*DependentObject methods: */
-                int  NumDependents(void);
-                void Responsex(IssmDouble* poutput_value,FemModel* femmodel);
+                void       Responsex(IssmDouble *poutput_value,FemModel*femmodel);
                 IssmDouble GetValue(void);
-                void AddValue(IssmDouble in_value);
-                void ResetResponseValue(void);
+                void       AddValue(IssmDouble in_value);
+                void       ResetResponseValue(void);
 
 };

issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp

@@ -15 +15 @@
         int         num_dep=0;
         char**      names=NULL;
-        int*        types=NULL;
         int         dummy;
         char*       autodiff_driver=NULL;
@@ -152 +151 @@
                 if(num_dependent_objects){
                         iomodel->FindConstant(&names,&dummy,"md.autodiff.dependent_object_names");
-                        iomodel->FetchData(&types,&dummy,&dummy,"md.autodiff.dependent_object_types");
                         iomodel->FetchData(&indices,&dummy,&dummy,"md.autodiff.dependent_object_indices");
 
                         for(i=0;i<num_dependent_objects;i++){
-                                DependentObject* dep=new DependentObject(names[i],types[i],indices[i]);
+                                DependentObject* dep=new DependentObject(names[i],indices[i]);
                                 dependent_objects->AddObject(dep);
-                                num_dep+=dep->NumDependents();
+                                num_dep++;
                         }
 
@@ -166 +164 @@
                         }
                         xDelete<char*>(names);
-                        xDelete<int>(types);
                         xDelete<int>(indices);
                 }