Changeset 1306


Ignore:
Timestamp:
10/13/17 17:42:10 (4 years ago)
Author:
oabramkina
Message:

Correcting a check on freq_op and freq_offset: if freq_offset is defined it shouldn't be overwritten.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp

    r1303 r1306  
    827827 
    828828        solveGridReference(); 
    829         grid->solveDomainAxisRefInheritance(true); // make it again to solve grid reading from file 
    830829 
    831830        if (context->hasClient && !context->hasServer) 
     
    15781577     if (freq_op.isEmpty()) 
    15791578     { 
    1580 /* 
    1581        if (!freq_offset.isEmpty()) 
    1582          ERROR("CField::checkAttributes(void)", 
    1583                << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] " 
    1584                << "Attribute freq_offset cannot be defined if attribute freq_op is not defined. " 
    1585                << "Please define freq_op.") */ 
    15861579       if (operation.getValue()=="instant") 
    1587        { 
    15881580         freq_op.setValue(file->output_freq.getValue()); 
    1589          if (freq_offset.isEmpty()) freq_offset.setValue(file->output_freq.getValue()-TimeStep); 
    1590        } 
    15911581       else 
    1592        { 
    15931582         freq_op.setValue(TimeStep); 
    1594          if (freq_offset.isEmpty()) freq_offset.setValue(freq_op.getValue()-TimeStep); 
    1595        } 
    1596      } 
    1597      else 
    1598      { 
    1599        if (freq_offset.isEmpty()) 
    1600          freq_offset.setValue(freq_op.getValue()-TimeStep); 
    1601      } 
     1583     } 
     1584     if (freq_offset.isEmpty()) 
     1585       freq_offset.setValue(freq_op.getValue()-TimeStep); 
    16021586   } 
    16031587 
Note: See TracChangeset for help on using the changeset viewer.