clean up tests

Author: alicebarthel

components/omega/src/ocn/Tendencies.cpp

@@ -137,6 +137,15 @@ Tendencies *Tendencies::get(const std::string &Name ///< [in] Name of tendencies
 
 } // end get tendencies
 
+//------------------------------------------------------------------------------
+// Check if tendencies exists by name
+bool Tendencies::exists(const std::string &Name ///< [in] Name of tendencies
+) {
+
+   return AllTendencies.find(Name) != AllTendencies.end();
+
+} // end exists
+
 //------------------------------------------------------------------------------
 // read and set config options
 void Tendencies::readConfig(Config *OmegaConfig ///< [in] Omega config

components/omega/src/ocn/Tendencies.h

@@ -154,6 +154,10 @@ class Tendencies {
    static Tendencies *get(const std::string &Name ///< [in]
    );
 
+   // check if tendencies exists by name
+   static bool exists(const std::string &Name ///< [in]
+   );
+
    // read and set config options
    void readConfig(Config *OmegaConfig);
 

components/omega/src/ocn/forcingVars/SfcStressForcingVars.cpp

@@ -61,8 +61,12 @@ void SfcStressForcingVars::registerFields(
 }
 
 void SfcStressForcingVars::unregisterFields() const {
-   Field::destroy(ZonalStressCell.label());
-   Field::destroy(MeridStressCell.label());
+   if (Field::exists(ZonalStressCell.label())) {
+      Field::destroy(ZonalStressCell.label());
+   }
+   if (Field::exists(MeridStressCell.label())) {
+      Field::destroy(MeridStressCell.label());
+   }
 }
 
 } // namespace OMEGA