Changeset 1120 for XIOS

Timestamp:

05/05/17 08:58:34 (7 years ago)

Author:

rlacroix

Message:

Add some error checking for xios_field_is_active.

It does not make sense to call this function on fields that cannot be used to send or receive data.

File:

• XIOS/trunk/src/node/field.cpp (modified) (1 diff)

XIOS/trunk/src/node/field.cpp

@@ -520 +520 @@
    bool CField::isActive(bool atCurrentTimestep /*= false*/) const
    {
-      if (atCurrentTimestep && clientSourceFilter)
-        return clientSourceFilter->isDataExpected(CContext::getCurrent()->getCalendar()->getCurrentDate());
-      else
-        return (instantDataFilter != NULL);
+      if (clientSourceFilter)
+        return atCurrentTimestep ? clientSourceFilter->isDataExpected(CContext::getCurrent()->getCalendar()->getCurrentDate()) : true;
+      else if (storeFilter)
+        return true;
+      else if (instantDataFilter)
+        ERROR("bool CField::isActive(bool atCurrentTimestep)",
+              << "Impossible to check if field [ id = " << getId() << " ] is active as it cannot be used to receive nor send data.");
+
+      return false;
    }