From 8d1dc699f1ee53ccdd90a443bc8d73c713efd35f Mon Sep 17 00:00:00 2001
From: Hyun Kang <kangh@ornl.gov>
Date: Wed, 8 Jul 2026 17:35:25 -0400
Subject: [PATCH 1/2] Resolve FillValueTest CTest issue

---
 components/omega/test/ocn/FillValueTest.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/omega/test/ocn/FillValueTest.cpp b/components/omega/test/ocn/FillValueTest.cpp
index d0b268a9e721..1dbdf1672538 100644
--- a/components/omega/test/ocn/FillValueTest.cpp
+++ b/components/omega/test/ocn/FillValueTest.cpp
@@ -25,6 +25,7 @@
 #include "DataTypes.h"
 #include "Decomp.h"
 #include "Dimension.h"
+#include "Eos.h"
 #include "Error.h"
 #include "Field.h"
 #include "Halo.h"
@@ -42,6 +43,7 @@
 #include "TimeStepper.h"
 #include "Tracers.h"
 #include "VertCoord.h"
+#include "VertMix.h"
 #include "mpi.h"
 
 #include <netcdf.h>
@@ -130,6 +132,8 @@ void initFillValueTest() {
    Tracers::init();
    AuxiliaryState::init();
    PressureGrad::init();
+   Eos::init();
+   VertMix::init();
    Tendencies::init();
    TimeStepper::init2();
 

From 12ef5bcb2252f2fe9ee8d76d190fa6bb9c04c4fd Mon Sep 17 00:00:00 2001
From: Hyun Kang <kangh@ornl.gov>
Date: Wed, 8 Jul 2026 17:53:24 -0400
Subject: [PATCH 2/2] Destroy instances for VertMix and Eos

---
 components/omega/test/ocn/FillValueTest.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/omega/test/ocn/FillValueTest.cpp b/components/omega/test/ocn/FillValueTest.cpp
index 1dbdf1672538..c692a43ca50e 100644
--- a/components/omega/test/ocn/FillValueTest.cpp
+++ b/components/omega/test/ocn/FillValueTest.cpp
@@ -438,6 +438,8 @@ int main(int argc, char *argv[]) {
       // ------------------------------------------------------------------
       OceanState::clear();
       Tendencies::clear();
+      Eos::destroyInstance();
+      VertMix::destroyInstance();
       PressureGrad::clear();
       AuxiliaryState::clear();
       Tracers::clear();