Changeset 25512

Timestamp:

09/01/20 16:43:10 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removed duplicates

Location:

issm/trunk-jpl/src/c

Files:

• cores/transient_core.cpp (modified) (1 diff)
• shared/io/Marshalling/Marshalling.h (modified) (4 diffs)

issm/trunk-jpl/src/c/cores/transient_core.cpp

@@ -357 +357 @@
 
         for(int i=0;i<Xsize;i++) Xb[i] += X[i].gradient();
-        InitAdjointFunctor* marshallhandle3 = new InitAdjointFunctor(Yb);
+        SetAdjointFunctor* marshallhandle3 = new SetAdjointFunctor(Yb);
         femmodel->Marshall(marshallhandle3);
         delete marshallhandle3;

issm/trunk-jpl/src/c/shared/io/Marshalling/Marshalling.h

@@ -20 +20 @@
         AD_REGISTERINPUT,
         AD_REGISTEROUTPUT,
-        AD_INITADJOINT,
         AD_SETADJOINT,
 #endif
@@ -212 +211 @@
                 }
 }; /*}}}*/
-class InitAdjointFunctor:     public MarshallHandle{ /*{{{*/
-
-        private:
-                int                   double_count;
-                IssmDouble::TapeType* tape_codi;
-                double*               adjoint;
-
-        public:
-                InitAdjointFunctor(double* adjoint_in) : MarshallHandle(AD_INITADJOINT){
-                        this->double_count = 0;
-                        this->tape_codi    = &(IssmDouble::getGlobalTape());
-                        this->adjoint      = adjoint_in;
-                }
-                void Echo(void){
-                        printf("InitAdjointFunctor Echo:\n");
-                        printf("   double_count: %i\n",double_count);
-                }
-                template<typename T> void call(T & value){
-                        /*General case: do nothing*/
-                }
-                template<typename T> void call(T* & value,int size){
-                        /*General case: do nothing*/
-                }
-                void call(IssmDouble value){
-                        value.gradient() = adjoint[this->double_count];
-                        this->double_count++;
-                }
-                void call(IssmDouble* value,int size){
-                        if(value){
-                                for(int i=0;i<size;i++){
-                                        value[i].gradient() = adjoint[this->double_count];
-                                        this->double_count++;
-                                }
-                        }
-                }
-}; /*}}}*/
 class SetAdjointFunctor:      public MarshallHandle{ /*{{{*/
 
@@ -295 +258 @@
                 case AD_REGISTERINPUT: {RegisterInputFunctor*  temp = xDynamicCast<RegisterInputFunctor*>(this);   temp->call(value); break;}
                 case AD_REGISTEROUTPUT:{RegisterOutputFunctor* temp = xDynamicCast<RegisterOutputFunctor*>(this);  temp->call(value); break;}
-                case AD_INITADJOINT:   {InitAdjointFunctor*    temp = xDynamicCast<InitAdjointFunctor*>(this);     temp->call(value); break;}
                 case AD_SETADJOINT:    {SetAdjointFunctor*     temp = xDynamicCast<SetAdjointFunctor*>(this);      temp->call(value); break;}
 #endif
@@ -310 +272 @@
                 case AD_REGISTERINPUT: {RegisterInputFunctor*  temp = xDynamicCast<RegisterInputFunctor*>(this);   temp->call(value,size); break;}
                 case AD_REGISTEROUTPUT:{RegisterOutputFunctor* temp = xDynamicCast<RegisterOutputFunctor*>(this);  temp->call(value,size); break;}
-                case AD_INITADJOINT:   {InitAdjointFunctor*    temp = xDynamicCast<InitAdjointFunctor*>(this);     temp->call(value,size); break;}
                 case AD_SETADJOINT:    {SetAdjointFunctor*     temp = xDynamicCast<SetAdjointFunctor*>(this);      temp->call(value,size); break;}
 #endif