Skip to content

Commit 71276c0

Browse files
mperegomperego
committed
Remove option "MESH_DEPENDS_ON_SOLUTION", issue #840 
1 parent 279c620 commit 71276c0

15 files changed

+14
-60
lines changed

‎doc/dashboards/cee-compute011.sandia.gov/ctest_nightly_tmp.cmake

-6
Original file line numberDiff line numberDiff line change
@@ -447,35 +447,30 @@ if (BUILD_ALB64)
447447
set(TRILINSTALLDIR ${CTEST_INSTALL_DIRECTORY}/TrilinosInstall)
448448
set(BUILDTYPE "RELEASE")
449449
set(FPE_CHECK "OFF")
450-
set(MESH_DEP_ON_SOLN "ON")
451450
set(MESH_DEP_ON_PARAMS "OFF")
452451
endif(BUILD_ALB64)
453452
if (BUILD_INTEL_ALBANY)
454453
set(TRILINSTALLDIR ${CTEST_INSTALL_DIRECTORY}/TrilinosIntelInstall)
455454
set(BUILDTYPE "RELEASE")
456455
set(FPE_CHECK "OFF")
457-
set(MESH_DEP_ON_SOLN "OFF")
458456
set(MESH_DEP_ON_PARAMS "ON")
459457
endif (BUILD_INTEL_ALBANY)
460458
if (BUILD_ALB64CLANG)
461459
set(TRILINSTALLDIR ${CTEST_INSTALL_DIRECTORY}/TrilinosInstallC11)
462460
set(BUILDTYPE "RELEASE")
463461
set(FPE_CHECK "OFF")
464-
set(MESH_DEP_ON_SOLN "OFF")
465462
set(MESH_DEP_ON_PARAMS "OFF")
466463
endif (BUILD_ALB64CLANG)
467464
if (BUILD_ALB64CLANGDBG)
468465
set(TRILINSTALLDIR ${CTEST_INSTALL_DIRECTORY}/TrilinosInstallC11Dbg)
469466
set(BUILDTYPE "DEBUG")
470467
set(FPE_CHECK "ON")
471-
set(MESH_DEP_ON_SOLN "OFF")
472468
set(MESH_DEP_ON_PARAMS "OFF")
473469
endif (BUILD_ALB64CLANGDBG)
474470
if (BUILD_ALB64DBG)
475471
set(TRILINSTALLDIR ${CTEST_INSTALL_DIRECTORY}/TrilinosDbg)
476472
set(BUILDTYPE "DEBUG")
477473
set(FPE_CHECK "ON")
478-
set(MESH_DEP_ON_SOLN "OFF")
479474
set(MESH_DEP_ON_PARAMS "OFF")
480475
endif (BUILD_ALB64DBG)
481476

@@ -485,7 +480,6 @@ endif (BUILD_ALB64DBG)
485480
"-DENABLE_LANDICE:BOOL=ON"
486481
"-DENABLE_UNIT_TESTS:BOOL=ON"
487482
"-DENABLE_STRONG_FPE_CHECK:BOOL=ON"
488-
"-DENABLE_MESH_DEPENDS_ON_SOLUTION:BOOL=${MESH_DEP_ON_SOLN}"
489483
"-DENABLE_MESH_DEPENDS_ON_PARAMETERS:BOOL=${MESH_DEP_ON_PARAMS}"
490484
"-DCMAKE_BUILD_TYPE:STRING=${BUILDTYPE}"
491485
"-DENABLE_STRONG_FPE_CHECK:BOOL=${FPE_CHECK}"

‎src/Albany_config.h.in

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737

3838
// Whether mesh and parameters depend on each others and/or solution
3939
#cmakedefine ALBANY_MESH_DEPENDS_ON_PARAMETERS
40-
#cmakedefine ALBANY_MESH_DEPENDS_ON_SOLUTION
4140

4241
// Cuda options
4342
#cmakedefine ALBANY_CUDA_ERROR_CHECK

‎src/LandIce/problems/LandIce_StokesFOBase.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ constructInterpolationEvaluators (PHX::FieldManager<PHAL::AlbanyTraits>& fm0)
698698
// if (st==FieldScalarType::ParamScalar) {
699699
// useMemoization &= !Albany::params_depend_on_solution();
700700
// } else if (st==FieldScalarType::MeshScalar) {
701-
// useMemoization &= !Albany::mesh_depends_on_solution() && !Albany::mesh_depends_on_parameters();
701+
// useMemoization &= !Albany::mesh_depends_on_parameters();
702702
// }
703703

704704
// Get the needs of this field
@@ -819,7 +819,7 @@ constructInterpolationEvaluators (PHX::FieldManager<PHAL::AlbanyTraits>& fm0)
819819
// if (st==FieldScalarType::ParamScalar) {
820820
// useMemoization &= !Albany::params_depend_on_solution();
821821
// } else if (st==FieldScalarType::MeshScalar) {
822-
// useMemoization &= !Albany::mesh_depends_on_solution() && !Albany::mesh_depends_on_parameters();
822+
// useMemoization &= !Albany::mesh_depends_on_parameters();
823823
// }
824824

825825
// Get the right evaluator utils for this field.

‎src/LandIce/problems/LandIce_StokesFOThickness.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ void StokesFOThickness::setFieldsProperties () {
189189
StokesFOBase::setFieldsProperties();
190190

191191
// Fix the scalar type of ice_thickness_name, since in StokesFOThickness it depends on the solution.
192-
// Note: the ST of surface_height doesn't *need* to be Scalar if MESH_DEPENDS_ON_SOLUTION=OFF,
192+
// Note: the ST of surface_height doesn't *need* to be Scalar,
193193
// But if they don't match StokesFOLateralResid would need a second template argument.
194194
// This simply makes life easier.
195195
setSingleFieldProperties(ice_thickness_name, FRT::Scalar, FST::Scalar);

‎src/LandIce/problems/LandIce_StokesFOThickness.hpp

+3-29
Original file line numberDiff line numberDiff line change
@@ -252,35 +252,9 @@ void StokesFOThickness::constructThicknessEvaluators (PHX::FieldManager<PHAL::Al
252252
ev = Teuchos::rcp(new LandIce::ThicknessResid<EvalT,PHAL::AlbanyTraits>(*p,dl));
253253
fm0.template registerEvaluator<EvalT>(ev);
254254

255-
if (Albany::mesh_depends_on_solution()) {
256-
//--- Gather Coordinates ---//
257-
p = Teuchos::rcp(new Teuchos::ParameterList("Gather Coordinate Vector"));
258-
259-
// Output:: Coordinate Vector at vertices
260-
p->set<std::string>("Coordinate Vector Name", "Coord Vec Old");
261-
262-
ev = Teuchos::rcp(new PHAL::GatherCoordinateVector<EvalT,PHAL::AlbanyTraits>(*p,dl));
263-
fm0.template registerEvaluator<EvalT>(ev);
264-
265-
//--- Update Z Coordinate ---//
266-
p = Teuchos::rcp(new Teuchos::ParameterList("Update Z Coordinate"));
267-
268-
// Input
269-
p->set<std::string>("Old Coords Name", "Coord Vec Old");
270-
p->set<std::string>("New Coords Name", Albany::coord_vec_name);
271-
p->set<std::string>("Thickness Increment Name", "Extruded " + dof_names[1]);
272-
p->set<std::string>("Past Thickness Name", initial_ice_thickness_name);
273-
p->set<std::string>("Top Surface Name", surface_height_name);
274-
p->set<std::string>("Bed Topography Name", bed_topography_name);
275-
p->set<Teuchos::ParameterList*>("Physical Parameter List", &params->sublist("LandIce Physical Parameters"));
276-
277-
ev = Teuchos::rcp(new LandIce::UpdateZCoordinateMovingTop<EvalT,PHAL::AlbanyTraits>(*p, dl));
278-
fm0.template registerEvaluator<EvalT>(ev);
279-
} else {
280-
//---- Gather coordinates
281-
ev = evalUtils.constructGatherCoordinateVectorEvaluator();
282-
fm0.template registerEvaluator<EvalT> (ev);
283-
}
255+
//---- Gather coordinates
256+
ev = evalUtils.constructGatherCoordinateVectorEvaluator();
257+
fm0.template registerEvaluator<EvalT> (ev);
284258

285259
//--- Compute actual thickness --- //
286260
p = Teuchos::rcp(new Teuchos::ParameterList("Update Thickness"));

‎src/evaluators/interpolation/PHAL_DOFGradInterpolation.hpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class FastSolutionGradInterpolationBase : public DOFGradInterpolationBase<EvalT,
112112
}
113113
};
114114

115-
#ifndef ALBANY_MESH_DEPENDS_ON_SOLUTION //assumes that the bases gradients are not FAD types
115+
//this class assumes that the bases gradients are not FAD types
116116
template<typename Traits>
117117
class FastSolutionGradInterpolationBase<PHAL::AlbanyTraits::Jacobian, Traits, typename PHAL::AlbanyTraits::Jacobian::ScalarT>
118118
: public DOFGradInterpolationBase<PHAL::AlbanyTraits::Jacobian, Traits, typename PHAL::AlbanyTraits::Jacobian::ScalarT> {
@@ -156,7 +156,6 @@ class FastSolutionGradInterpolationBase<PHAL::AlbanyTraits::Jacobian, Traits, ty
156156
#endif
157157

158158
};
159-
#endif //ALBANY_MESH_DEPENDS_ON_SOLUTION
160159

161160
// Some shortcut names
162161
template<typename EvalT, typename Traits>

‎src/evaluators/interpolation/PHAL_DOFGradInterpolation_Def.hpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ evaluateFields(typename Traits::EvalData workset)
164164

165165
}
166166
//Specialization for Jacobian evaluation taking advantage of the sparsity of the derivatives
167+
//Note, this assumes that the mesh is not FAD type
167168
// *********************************************************************
168-
#ifndef ALBANY_MESH_DEPENDS_ON_SOLUTION
169169

170170
// Kokkos kernel for Jacobian
171171
#ifdef ALBANY_KOKKOS_UNDER_DEVELOPMENT
@@ -238,7 +238,6 @@ evaluateFields(typename Traits::EvalData workset)
238238

239239

240240
}
241-
#endif //ALBANY_MESH_DEPENDS_ON_SOLUTION
242241

243242
//**********************************************************************
244243

‎src/evaluators/interpolation/PHAL_DOFTensorGradInterpolation.hpp

-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ class FastSolutionTensorGradInterpolationBase : public DOFTensorGradInterpolatio
8888

8989

9090
//! Specialization for Jacobian evaluation taking advantage of known sparsity
91-
#ifndef ALBANY_MESH_DEPENDS_ON_SOLUTION
9291
template<typename Traits>
9392
class FastSolutionTensorGradInterpolationBase<PHAL::AlbanyTraits::Jacobian, Traits, typename PHAL::AlbanyTraits::Jacobian::ScalarT>
9493
: public DOFTensorGradInterpolationBase<PHAL::AlbanyTraits::Jacobian, Traits, typename PHAL::AlbanyTraits::Jacobian::ScalarT>
@@ -117,7 +116,6 @@ class FastSolutionTensorGradInterpolationBase<PHAL::AlbanyTraits::Jacobian, Trai
117116

118117
std::size_t offset;
119118
};
120-
#endif
121119

122120
// Some shortcut names
123121
template<typename EvalT, typename Traits>

‎src/evaluators/interpolation/PHAL_DOFTensorGradInterpolation_Def.hpp

-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ namespace PHAL {
7373
//Specialization for Jacobian evaluation taking advantage of the sparsity of the derivatives
7474

7575
//**********************************************************************
76-
#ifndef ALBANY_MESH_DEPENDS_ON_SOLUTION
7776
template<typename Traits>
7877
void FastSolutionTensorGradInterpolationBase<PHAL::AlbanyTraits::Jacobian, Traits, typename PHAL::AlbanyTraits::Jacobian::ScalarT>::
7978
evaluateFields(typename Traits::EvalData workset)
@@ -101,6 +100,5 @@ namespace PHAL {
101100
}
102101
}
103102
}
104-
#endif
105103

106104
} // Namespace PHAL

‎src/evaluators/interpolation/PHAL_DOFTensorInterpolation.hpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class FastSolutionTensorInterpolationBase : public DOFTensorInterpolationBase<Ev
8181

8282

8383
//! Specialization for Jacobian evaluation taking advantage of known sparsity
84-
#ifndef ALBANY_MESH_DEPENDS_ON_SOLUTION
84+
//! This assumes that the mesh coordinates are not a FAD type
8585
template<typename Traits>
8686
class FastSolutionTensorInterpolationBase<PHAL::AlbanyTraits::Jacobian, Traits, typename PHAL::AlbanyTraits::Jacobian::ScalarT>
8787
: public DOFTensorInterpolationBase<PHAL::AlbanyTraits::Jacobian, Traits, typename PHAL::AlbanyTraits::Jacobian::ScalarT>
@@ -110,7 +110,6 @@ class FastSolutionTensorInterpolationBase<PHAL::AlbanyTraits::Jacobian, Traits,
110110

111111
std::size_t offset;
112112
};
113-
#endif
114113

115114

116115
// Some shortcut names

‎src/evaluators/interpolation/PHAL_DOFTensorInterpolation_Def.hpp

-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ evaluateFields(typename Traits::EvalData workset)
6969
//**********************************************************************
7070
//! Specialization for Jacobian evaluation taking advantage of known sparsity
7171

72-
#ifndef ALBANY_MESH_DEPENDS_ON_SOLUTION
7372
template<typename Traits>
7473
void FastSolutionTensorInterpolationBase<PHAL::AlbanyTraits::Jacobian, Traits, typename PHAL::AlbanyTraits::Jacobian::ScalarT>::
7574
evaluateFields(typename Traits::EvalData workset)
@@ -97,7 +96,6 @@ evaluateFields(typename Traits::EvalData workset)
9796
}
9897
}
9998
}
100-
#endif //ALBANY_MESH_DEPENDS_ON_SOLUTION
10199
//**********************************************************************
102100

103101
} // Namespace PHAL

‎src/evaluators/interpolation/PHAL_DOFVecGradInterpolation.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ class FastSolutionVecGradInterpolationBase : public DOFVecGradInterpolationBase<
102102
};
103103

104104
//! Specialization for Jacobian evaluation taking advantage of known sparsity
105-
#ifndef ALBANY_MESH_DEPENDS_ON_SOLUTION
105+
//! This assumes that the Mesh coordinates are not a FAD type
106+
106107
template<typename Traits>
107108
class FastSolutionVecGradInterpolationBase<PHAL::AlbanyTraits::Jacobian, Traits, typename PHAL::AlbanyTraits::Jacobian::ScalarT>
108109
: public DOFVecGradInterpolationBase<PHAL::AlbanyTraits::Jacobian, Traits, typename PHAL::AlbanyTraits::Jacobian::ScalarT>
@@ -147,7 +148,6 @@ class FastSolutionVecGradInterpolationBase<PHAL::AlbanyTraits::Jacobian, Traits,
147148

148149
#endif
149150
};
150-
#endif //ALBANY_MESH_DEPENDS_ON_SOLUTION
151151

152152
// Some shortcut names
153153
template<typename EvalT, typename Traits>

‎src/evaluators/interpolation/PHAL_DOFVecGradInterpolation_Def.hpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ namespace PHAL {
123123
}
124124

125125
// Specialization for Jacobian evaluation taking advantage of known sparsity
126+
// This assumes that mesh coordinates are not FAD types
126127
//**********************************************************************
127128
//Kokkos functor Jacobian
128-
#ifndef ALBANY_MESH_DEPENDS_ON_SOLUTION
129129
#ifdef ALBANY_KOKKOS_UNDER_DEVELOPMENT
130130
template<typename Traits>
131131
KOKKOS_INLINE_FUNCTION
@@ -192,6 +192,5 @@ namespace PHAL {
192192

193193
#endif
194194
}
195-
#endif //ALBANY_MESH_DEPENDS_ON_SOLUTION
196195

197196
} // Namespace PHAL

‎src/evaluators/interpolation/PHAL_DOFVecInterpolation.hpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class FastSolutionVecInterpolationBase
8383
};
8484

8585
//! Specialization for Jacobian evaluation taking advantage of known sparsity
86-
#ifndef ALBANY_MESH_DEPENDS_ON_SOLUTION
86+
// This assumes that the Mesh coordinates are not of FAD type
8787
template<typename Traits>
8888
class FastSolutionVecInterpolationBase<PHAL::AlbanyTraits::Jacobian, Traits, typename PHAL::AlbanyTraits::Jacobian::ScalarT>
8989
: public DOFVecInterpolationBase<PHAL::AlbanyTraits::Jacobian, Traits, typename PHAL::AlbanyTraits::Jacobian::ScalarT>
@@ -111,7 +111,6 @@ class FastSolutionVecInterpolationBase<PHAL::AlbanyTraits::Jacobian, Traits, typ
111111

112112
std::size_t offset;
113113
};
114-
#endif //ALBANY_MESH_DEPENDS_ON_SOLUTION
115114

116115
// Some shortcut names
117116
template<typename EvalT, typename Traits>

‎src/evaluators/interpolation/PHAL_DOFVecInterpolation_Def.hpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,9 @@ std::cout<< "DOFVecInterpolationBase Residual time = " << millisec << " " <<
133133
}
134134

135135
// Specialization for Jacobian evaluation taking advantage of known sparsity
136+
// This assumes that the Mesh coordinates are not of FAD type
136137
//**********************************************************************
137138

138-
#ifndef ALBANY_MESH_DEPENDS_ON_SOLUTION
139-
140139
//Kokkos kernel for Jacobian
141140
template <typename ScalarT, class Device, class MDFieldType, class MDFieldTypeFad1, class MDFieldTypeFad2>
142141
class VecInterpolationJacob {
@@ -221,6 +220,5 @@ evaluateFields(typename Traits::EvalData workset)
221220
#endif
222221

223222
}
224-
#endif //ALBANY_MESH_DEPENDS_ON_SOLUTION
225223

226224
}

0 commit comments

Comments
 (0)