Merge branch 'master' into develop

SciCompKL · Jul 9, 2024 · ddd3391 · ddd3391
2 parents e8d6d33 + 22507e9
commit ddd3391
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/include/codi/tapes/commonTapeImplementation.hpp b/include/codi/tapes/commonTapeImplementation.hpp
@@ -535,9 +535,9 @@ namespace codi {
           func.template call<callType>(&impl, dataView, std::forward<Args>(args)...);
 
           codiAssert(endPos == dataView.getPosition());
-        } else if (LowLevelFunctionEntryCallKind::Delete == callType) CODI_Unlikely {
+        } else CODI_Unlikely if (LowLevelFunctionEntryCallKind::Delete == callType) {
           // No delete registered. Data is skiped by the curLLFByteDataPos update.
-        } else CODI_Unlikely {
+        } else {
           CODI_EXCEPTION("Requested call is not supported for low level function with token '%d'.", (int)id);
         }
 

diff --git a/include/codi/tapes/jacobianBaseTape.hpp b/include/codi/tapes/jacobianBaseTape.hpp
@@ -898,7 +898,7 @@ namespace codi {
 
       CODI_NO_INLINE void internalResizeAdjointsVector() {
         // overallocate as next multiple of Config::ChunkSize
-        adjoints.resize(getNextMultiple((size_t)indexManager.get().getLargestCreatedIndex() + 1, Config::ChunkSize));
+        adjoints.resize(getNextMultiple(indexManager.get().getLargestCreatedIndex() + 1, (Identifier)Config::ChunkSize));
       }
   };
 }
diff --git a/include/codi/tapes/jacobianLinearTape.hpp b/include/codi/tapes/jacobianLinearTape.hpp
@@ -217,7 +217,7 @@ namespace codi {
                                                                       // curAdjointPos at the end of the loop.
 
             EventSystem<JacobianLinearTape>::notifyStatementEvaluateListeners(
-                tape, curAdjointPos, GradientTraits::dim<Adjoint>(), GradientTraits::toArray(lhsAdjoint).data());
+                tape, (Identifier)curAdjointPos, GradientTraits::dim<Adjoint>(), GradientTraits::toArray(lhsAdjoint).data());
 
             if (Config::ReversalZeroesAdjoints) {
               adjointVector[curAdjointPos] = Adjoint();

diff --git a/include/codi/tapes/tagging/tagTapeBase.hpp b/include/codi/tapes/tagging/tagTapeBase.hpp
@@ -85,7 +85,8 @@ namespace codi {
       /// Callback for a tag error.
       using TagErrorCallback = void (*)(Tag const& correctTag, Tag const& wrongTag, void* userData);
 
-      static Tag constexpr PassiveTag = Tag(0);  ///< Tag indicating an inactive value.
+      static Tag constexpr PassiveTag = Tag(0);   ///< Tag indicating an inactive value.
+      static Tag constexpr InvalidTag = Tag(-1);  ///< Tag indicating an invalid value.
 
     protected:
 
@@ -223,7 +224,7 @@ namespace codi {
 
       /// Checks if the tag is correct. Errors are set on the ValidationIndicator object.
       CODI_INLINE void verifyTag(ValidationIndicator<Real, Tag>& vi, Tag const& tag) const {
-        if (PassiveTag != tag) {
+        if (PassiveTag != tag && InvalidTag != tag) {
           vi.isActive = true;
           if (tag != curTag) {
             vi.hasError = true;

diff --git a/include/codi/tapes/tagging/tagTapeReverse.hpp b/include/codi/tapes/tagging/tagTapeReverse.hpp
@@ -250,7 +250,7 @@ namespace codi {
 
       /// -1 tag.
       Identifier getInvalidIndex() const {
-        return Identifier(-1);
+        return Identifier(Base::InvalidTag);
       }
 
       /// Verify tag.