diff --git a/framework/include/base/Assembly.h b/framework/include/base/Assembly.h index c41804b79ce4..888ae1d8253e 100644 --- a/framework/include/base/Assembly.h +++ b/framework/include/base/Assembly.h @@ -1741,7 +1741,6 @@ class Assembly const std::set & vector_tags, Real scaling_factor); -#ifdef MOOSE_GLOBAL_AD_INDEXING /** * Process the value and \p derivatives() data of a vector of \p ADReals. When using global * indexing, this method simply caches the value (residual) for the provided \p vector_tags and @@ -1754,7 +1753,6 @@ class Assembly const std::set & vector_tags, const std::set & matrix_tags, Real scaling_factor); -#endif /** * Process the \p derivatives() data of a vector of \p ADReals. When using global indexing, this diff --git a/framework/src/base/Assembly.C b/framework/src/base/Assembly.C index c33633fb1d7a..0df57741d581 100644 --- a/framework/src/base/Assembly.C +++ b/framework/src/base/Assembly.C @@ -4827,6 +4827,16 @@ Assembly::processResidualsAndJacobian(const std::vector & residuals, for (const auto j : index_range(column_indices)) cacheJacobian(row_indices[i], column_indices[j], element_matrix(i, j), matrix_tags); } +#else +void +Assembly::processResidualsAndJacobian(const std::vector &, + const std::vector &, + const std::set &, + const std::set &, + const Real) +{ + mooseError("Assembly::processResidualsAndJacobian is only supported for global AD indexing"); +} #endif template void coordTransformFactor(const SubProblem & s, diff --git a/framework/src/kernels/ADKernelScalarBase.C b/framework/src/kernels/ADKernelScalarBase.C index 58b9f90073c8..a307d1188271 100644 --- a/framework/src/kernels/ADKernelScalarBase.C +++ b/framework/src/kernels/ADKernelScalarBase.C @@ -49,9 +49,6 @@ ADKernelScalarBase::ADKernelScalarBase(const InputParameters & parameters) #ifndef MOOSE_GLOBAL_AD_INDEXING mooseError("ADKernelScalarBase only supported for global AD indexing"); #endif -#ifndef MOOSE_SPARSE_AD - mooseError("ADKernelScalarBase assembly only supported for non-sparse AD"); -#endif } void @@ -84,9 +81,6 @@ ADKernelScalarBase::computeJacobian() if (_compute_field_residuals) ADKernel::computeJacobian(); -#ifndef MOOSE_SPARSE_AD - mooseError("ADKernelScalarBase assembly only supported for non-sparse AD"); -#else if (_compute_scalar_residuals) { computeScalarResidualsForJacobian(); @@ -96,7 +90,6 @@ ADKernelScalarBase::computeJacobian() _matrix_tags, _kappa_var_ptr->scalingFactor()); } -#endif } void @@ -118,9 +111,6 @@ ADKernelScalarBase::computeResidualAndJacobian() if (_compute_field_residuals) ADKernel::computeResidualAndJacobian(); -#ifndef MOOSE_SPARSE_AD - mooseError("ADKernelScalarBase assembly only supported for non-sparse AD"); -#else if (_compute_scalar_residuals) { computeScalarResidualsForJacobian(); @@ -130,7 +120,6 @@ ADKernelScalarBase::computeResidualAndJacobian() _matrix_tags, _kappa_var_ptr->scalingFactor()); } -#endif } void diff --git a/libmesh b/libmesh index a476dcb36d78..3f05f40f4a45 160000 --- a/libmesh +++ b/libmesh @@ -1 +1 @@ -Subproject commit a476dcb36d78923b9d2ed13b937b388f00da77f4 +Subproject commit 3f05f40f4a45060c1fd07281f8869a4667086291