Changeset 762


Ignore:
Timestamp:
10/26/15 17:05:07 (5 years ago)
Author:
rlacroix
Message:

Domain: Fix some error messages to reference the correct function.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/src/node/domain.cpp

    r761 r762  
    944944     { 
    945945       if (!lonvalue_1d.isEmpty() && !lonvalue_2d.isEmpty()) 
    946          ERROR("CDomain::completeLonLatClient(void)", 
     946         ERROR("CDomain::checkLonLat()", 
    947947               << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] " 
    948948               << "Only one longitude attribute can be used but both 'lonvalue_1d' and 'lonvalue_2d' are defined." << std::endl 
     
    952952       { 
    953953         if ((type_attr::rectilinear != type) && (lonvalue_1d.numElements() != i_index.numElements())) 
    954            ERROR("CDomain::completeLonLatClient(void)", 
     954           ERROR("CDomain::checkLonLat()", 
    955955                 << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] " 
    956956                 << "'lonvalue_1d' does not have the same size as the local domain." << std::endl 
     
    962962       { 
    963963         if (lonvalue_2d.extent(0) != ni || lonvalue_2d.extent(1) != nj) 
    964            ERROR("CDomain::completeLonLatClient(void)", 
     964           ERROR("CDomain::checkLonLat()", 
    965965                 << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] " 
    966966                 << "'lonvalue_2d' does not have the same size as the local domain." << std::endl 
     
    970970 
    971971       if (!latvalue_1d.isEmpty() && !latvalue_2d.isEmpty()) 
    972          ERROR("CDomain::completeLonLatClient(void)", 
     972         ERROR("CDomain::checkLonLat()", 
    973973               << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] " 
    974974               << "Only one latitude attribute can be used but both 'latvalue_1d' and 'latvalue_2d' are defined." << std::endl 
     
    978978       { 
    979979         if ((type_attr::rectilinear != type) && (latvalue_1d.numElements() != i_index.numElements())) 
    980            ERROR("CDomain::completeLonLatClient(void)", 
     980           ERROR("CDomain::checkLonLat()", 
    981981                 << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] " 
    982982                 << "'latvalue_1d' does not have the same size as the local domain." << std::endl 
     
    988988       { 
    989989         if (latvalue_2d.extent(0) != ni || latvalue_2d.extent(1) != nj) 
    990            ERROR("CDomain::completeLonLatClient(void)", 
     990           ERROR("CDomain::checkLonLat()", 
    991991                 << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] " 
    992992                 << "'latvalue_2d' does not have the same size as the local domain." << std::endl 
     
    15281528          break; 
    15291529        default: 
    1530           ERROR("bool CContext::dispatchEvent(CEventServer& event)", 
     1530          ERROR("bool CDomain::dispatchEvent(CEventServer& event)", 
    15311531                << "Unknown Event"); 
    15321532          return false; 
Note: See TracChangeset for help on using the changeset viewer.