Skip to content

Init TotalVerticalTransportPseudoVelocity for testing. #575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
overfelt wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Init TotalVerticalTransportPseudoVelocity for testing. #575

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35b4775
Init TotalVerticalTransportPseudoVelocity for testing.
overfelt Sep 25, 2026
a5fa211
Adjust tolerances to pass on chrysalis
overfelt Sep 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 19 additions & 21 deletions components/omega/test/ocn/TendencyTermsTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ struct TestSetupSphere {
1.077950920692842e-06};
ErrorMeasures ExpectedFCTHInv = {3.054397382906693e-05,
1.0779509220589763e-06};
ErrorMeasures ExpectedFCTHNew = {3.0541724683419424e-05,
ErrorMeasures ExpectedFCTHNew = {3.0543973828844884e-05,
1.0779233406323438e-06};
ErrorMeasures ExpectedFCT_High = {0.00146484375, 16478.526025524854};
ErrorMeasures ExpectedFCT_Low = {0, 0};
Expand Down Expand Up @@ -1316,7 +1316,7 @@ class TracerHorzAdvOnCellTest : public TracerHorzAdvOnCell {

int testFCTTracerHorzAdvOnCell(int NVertLayers, int NTracers, Real RTol) {

I4 Err = 0;
I4 Err = 0, TotErr = 0;
TestSetup Setup;
const auto Mesh = HorzMesh::getDefault();
const auto VCoord = VertCoord::getDefault();
Expand All @@ -1328,7 +1328,7 @@ int testFCTTracerHorzAdvOnCell(int NVertLayers, int NTracers, Real RTol) {
Array3DReal ExactTrFluxDiv("ExactTrFluxDiv", NTracers, Mesh->NCellsOwned,
NVertsFCT);

Err += setScalar(
setScalar(
KOKKOS_LAMBDA(Real X, Real Y) { return Setup.tracerFluxDiv(X, Y); },
ExactTrFluxDiv, Geom, Mesh, OnCell, ExchangeHalos::No);

Expand Down Expand Up @@ -1373,6 +1373,7 @@ int testFCTTracerHorzAdvOnCell(int NVertLayers, int NTracers, Real RTol) {
const auto VAdv = VertAdv::getDefault();
deepCopy(VAdv->VerticalPseudoVelocity, 10._Real);
deepCopy(VAdv->TotalVerticalPseudoVelocity, 10._Real);
deepCopy(VAdv->TotalVerticalTransportPseudoVelocity, 10._Real);

TracerHorzAdvOnCellTest TrHorzAdvOnC(Mesh, VCoord, VAdv);
TrHorzAdvOnC.ForceLowOrder = false;
Expand All @@ -1397,32 +1398,35 @@ int testFCTTracerHorzAdvOnCell(int NVertLayers, int NTracers, Real RTol) {
ICell, K, Dt, FluxPseudoThickEdge, LayerThickness,
NormalVelocity);
});
Kokkos::fence();

const auto HProvInv = TrHorzAdvOnC.GetHProvInv();
const auto HProv = TrHorzAdvOnC.GetHProv();
const auto HNewInv = TrHorzAdvOnC.GetHNewInv();

const Real ATol = 1.0e-10;
Err = 0;
const Real ATol = sizeof(Real) == 4 ? 1e-4 : 1e-10;
Err += computeErrors(FCTErrors, HProv, HProvExact, Mesh, OnCell);
Err += checkErrors("TendencyTermsTest", "FCTHProv", FCTErrors,
Setup.ExpectedFCTHProv, RTol, ATol);

if (Err == 0)
LOG_INFO("TendencyTermsTest: FCTHProv PASS");
TotErr += Err;
Err = 0;

Err += computeErrors(FCTErrors, HProvInv, HProvInvExact, Mesh, OnCell);
Err += checkErrors("TendencyTermsTest", "FCTHProvInv", FCTErrors,
Setup.ExpectedFCTHInv, RTol, ATol);
if (Err == 0)
LOG_INFO("TendencyTermsTest: FCTHProvInv PASS");
TotErr += Err;
Err = 0;

Err += computeErrors(FCTErrors, HNewInv, HNewInvExact, Mesh, OnCell);
Err += checkErrors("TendencyTermsTest", "FCTHNewInv", FCTErrors,
Setup.ExpectedFCTHNew, RTol, ATol);
if (Err == 0)
LOG_INFO("TendencyTermsTest: FCTHNewInv PASS");
TotErr += Err;
Err = 0;
}
for (int L = 0; L < NTracers; ++L) {
Expand All @@ -1446,6 +1450,7 @@ int testFCTTracerHorzAdvOnCell(int NVertLayers, int NTracers, Real RTol) {
if (Err == 0)
LOG_INFO("TendencyTermsTest: FCTTracerCurFill_" + std::to_string(L) +
" PASS");
TotErr += Err;
Err = 0;
}
{
Expand Down Expand Up @@ -1477,7 +1482,6 @@ int testFCTTracerHorzAdvOnCell(int NVertLayers, int NTracers, Real RTol) {
TrHorzAdvOnC.FCTHighAndLowOrderFlux(
Team, IEdge, FluxPseudoThickEdge, NormalVelocity);
});
Kokkos::fence();

Array2DReal LowOrderFlx = TrHorzAdvOnC.GetLowOrderFlx();
const auto DvEdge = Mesh->DvEdge;
Expand All @@ -1494,6 +1498,7 @@ int testFCTTracerHorzAdvOnCell(int NVertLayers, int NTracers, Real RTol) {
FCTErrors, Setup.ExpectedFCT_Low, RTol, ATol);
if (Err == 0)
LOG_INFO("TendencyTermsTest: FCTHighAndLowOrderFlux_Low PASS");
TotErr += Err;
Err = 0;
}
if (Geom == Geometry::Planar) {
Expand Down Expand Up @@ -1526,24 +1531,22 @@ int testFCTTracerHorzAdvOnCell(int NVertLayers, int NTracers, Real RTol) {
TrHorzAdvOnC.FCTHighAndLowOrderFlux(
Team, IEdge, FluxPseudoThickEdge, NormalVelocity);
});
Kokkos::fence();

parallelFor(
{Mesh->NEdgesHaloH(1), NVertLayers},
KOKKOS_LAMBDA(const int IEdge, const int K) {
FluxSubView(IEdge, K) = 0;
});

const Real ATol = 1.0e-10;
const Real ATol = sizeof(Real) == 4 ? 1e-8 : 1e-10;
Array2DReal HighOrderFlx = TrHorzAdvOnC.GetHighOrderFlx();
Err += computeErrors(FCTErrors, HighOrderFlx, FluxSubView, Mesh, OnEdge);
Err += checkErrors("TendencyTermsTest", "FCTHighAndLowOrderFlux_High",
FCTErrors, Setup.ExpectedFCT_High, RTol, ATol);
if (Err == 0)
LOG_INFO("TendencyTermsTest: FCTHighAndLowOrderFlux_High PASS");
TotErr += Err;
Err = 0;

Kokkos::fence();
}
if (Geom == Geometry::Planar) {
setVectorEdge(
Expand Down Expand Up @@ -1581,33 +1584,30 @@ int testFCTTracerHorzAdvOnCell(int NVertLayers, int NTracers, Real RTol) {
TrHorzAdvOnC.FCTFluxInOut(Team, ICell, Dt, LayerThickness);
});

Kokkos::fence();
Err = 0;
Array2DReal FlxOut = TrHorzAdvOnC.GetFlxOut();
Err += computeErrors(FCTErrors, FlxOut, CellSubView, Mesh, OnCell);
Err += checkErrors("TendencyTermsTest", "FCTFluxOut", FCTErrors,
Setup.ExpectedFCTErrors, RTol);
if (Err == 0)
LOG_INFO("TendencyTermsTest: FCTFluxOut PASS");
TotErr += Err;
Err = 0;
Kokkos::fence();
}
{
parallelFor(
{Mesh->NEdgesHaloH(0), NVertLayers},
KOKKOS_LAMBDA(const int IEdge, const int K) {
TrHorzAdvOnC.FCTRescaleHighOrderFlux(IEdge, K);
});
Kokkos::fence();
const Array2DReal HighOrderFlx = TrHorzAdvOnC.GetHighOrderFlx();
Err += computeErrors(FCTErrors, HighOrderFlx, ReferenceSolution, Mesh,
OnEdge);
Err += checkErrors("TendencyTermsTest", "FCTRescaleHighOrderFlux",
FCTErrors, Setup.ExpectedFCTErrors, RTol);
if (Err == 0)
LOG_INFO("TendencyTermsTest: FCTRescaleHighOrderFlux PASS");
TotErr += Err;
Err = 0;
Kokkos::fence();
}
{
setVectorEdge(
Expand Down Expand Up @@ -1650,7 +1650,6 @@ int testFCTTracerHorzAdvOnCell(int NVertLayers, int NTracers, Real RTol) {
TrHorzAdvOnC.FCTAccumulateHighOrderFlux(Team, ICell, Dt, Tend,
LayerThickness);
});
Kokkos::fence();

const auto &MinLayerEdgeBot = VCoord->MinLayerEdgeBot;
const auto &MaxLayerEdgeTop = VCoord->MaxLayerEdgeTop;
Expand All @@ -1670,20 +1669,19 @@ int testFCTTracerHorzAdvOnCell(int NVertLayers, int NTracers, Real RTol) {
deepCopy(TracerSubView,
Kokkos::subview(TendNoFCT, L, Kokkos::ALL, Kokkos::ALL));

const Real ATol = 1.0e-10;
const Real ATol = sizeof(Real) == 4 ? 1e-6 : 1e-10;
Err += computeErrors(FCTErrors, Tend, TracerSubView, Mesh, OnCell);
Err += checkErrors("TendencyTermsTest",
"FCTAccumulateHighOrderFlux_" + std::to_string(L),
FCTErrors, Setup.ExpectedFCTToNonFCT, RTol, ATol);
if (Err == 0)
LOG_INFO("TendencyTermsTest: FCTAccumulateHighOrderFlux_" +
std::to_string(L) + " PASS");
TotErr += Err;
Err = 0;
Kokkos::fence();
}

VertAdv::clear();
return Err;
return TotErr;
} // end testTracerHorzAdvOnCell

int testTracerDiffOnCell(int NVertLayers, int NTracers, Real RTol) {
Expand Down
Loading