Changeset 26432 for issm/trunk-jpl/src/c/classes/IoModel.cpp

Timestamp:

09/04/21 18:06:05 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: working on integrating CoDiPack 2.0, still not working

File:

• issm/trunk-jpl/src/c/classes/IoModel.cpp (modified) (5 diffs)

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

@@ -2065 +2065 @@
                                 scalar=pscalar;
                         }
-                        auto& tape_codi = IssmDouble::getGlobalTape();
+                        auto& tape_codi = IssmDouble::getTape();
                         tape_codi.registerInput(scalar);
-                        codi_global.input_indices.push_back(scalar.getGradientData());
+                        codi_global.input_indices.push_back(scalar.getIdentifier());
                 #else
                         if(X){
@@ -2138 +2138 @@
                         #if defined(_HAVE_CODIPACK_)
                                 // FIXME codi here we just assign instead of using "operator <<="
-                                auto& tape_codi = IssmDouble::getGlobalTape();
+                                auto& tape_codi = IssmDouble::getTape();
                                 if(X){
                                         for (int i=0;i<M*N;i++) {
                                                 matrix[i]=X[Xcount+i];
                                                 tape_codi.registerInput(matrix[i]);
-                                                codi_global.input_indices.push_back(matrix[i].getGradientData());
+                                                codi_global.input_indices.push_back(matrix[i].getIdentifier());
                                         }
                                 }
@@ -2150 +2150 @@
                                                 matrix[i]=buffer[i];
                                                 tape_codi.registerInput(matrix[i]);
-                                                codi_global.input_indices.push_back(matrix[i].getGradientData());
+                                                codi_global.input_indices.push_back(matrix[i].getIdentifier());
                                         }
                                 }
@@ -2963 +2963 @@
                  * -> These parameters are not read for the CoDiPack ISSM version!
                  */
-                auto& tape_codi = IssmDouble::getGlobalTape();
+                auto& tape_codi = IssmDouble::getTape();
                 tape_codi.setActive();
                 #if _AD_TAPE_ALLOC_
@@ -2976 +2976 @@
                 /*
                 std::stringstream out_s;
-                IssmDouble::getGlobalTape().printStatistics(out_s);
+                IssmDouble::getTape().printStatistics(out_s);
                 _printf0_("StartTrace::Tape Statistics     : TapeAlloc count=[" << codi_allocn << "]\n" << out_s.str());
                 */