Changeset 691


Ignore:
Timestamp:
09/15/15 17:31:24 (6 years ago)
Author:
mhnguyen
Message:

Correcting minor bugs after merging

Test
+) On Curie
+) All tests pass

Location:
XIOS/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/bld.cfg

    r688 r691  
    3535bld::target xios_server.exe test_remap.exe 
    3636#bld::target test_new_features.exe test_unstruct_complete.exe  
    37 #bld::target test_client.exe test_complete.exe 
     37bld::target test_client.exe test_complete.exe 
    3838bld::exe_dep 
    3939 
  • XIOS/trunk/src/interface/c_attr/icdomain_attr.cpp

    r690 r691  
    386386 
    387387 
    388   void cxios_set_domain_i_index(domain_Ptr domain_hdl, int* i_index, int extent1) 
     388  void cxios_set_domain_i_index(domain_Ptr domain_hdl, int* i_index, int* extent) 
    389389  { 
    390390    CTimer::get("XIOS").resume(); 
  • XIOS/trunk/src/interface/fortran_attr/domain_interface_attr.F90

    r690 r691  
    315315 
    316316 
    317     SUBROUTINE cxios_set_domain_i_index(domain_hdl, i_index, extent1) BIND(C) 
     317    SUBROUTINE cxios_set_domain_i_index(domain_hdl, i_index, extent) BIND(C) 
    318318      USE ISO_C_BINDING 
    319319      INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl 
  • XIOS/trunk/src/node/domain.cpp

    r689 r691  
    787787       } 
    788788 
    789        if (!bounds_lon_1d.isEmpty() && nvertex.getValue() != bounds_lon_1d.extent(1)) 
     789       if (!bounds_lon_1d.isEmpty() && nvertex.getValue() != bounds_lon_1d.extent(0)) 
    790790         ERROR("CDomain::checkBounds(void)", 
    791791               << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] " 
     
    794794               << " but nvertex is " << nvertex.getValue() << "."); 
    795795 
    796        if (!bounds_lon_2d.isEmpty() && nvertex.getValue() != bounds_lon_2d.extent(2)) 
     796       if (!bounds_lon_2d.isEmpty() && nvertex.getValue() != bounds_lon_2d.extent(0)) 
    797797         ERROR("CDomain::checkBounds(void)", 
    798798               << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] " 
     
    811811               << "Since 'bounds_lon_2d' is defined, 'lonvalue_2d' must be defined too." << std::endl); 
    812812 
    813        if (!bounds_lat_1d.isEmpty() && nvertex.getValue() != bounds_lat_1d.extent(1)) 
     813       if (!bounds_lat_1d.isEmpty() && nvertex.getValue() != bounds_lat_1d.extent(0)) 
    814814         ERROR("CDomain::checkBounds(void)", 
    815815               << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] " 
     
    818818               << " but nvertex is " << nvertex.getValue() << "."); 
    819819 
    820        if (!bounds_lat_2d.isEmpty() && nvertex.getValue() != bounds_lat_2d.extent(2)) 
     820       if (!bounds_lat_2d.isEmpty() && nvertex.getValue() != bounds_lat_2d.extent(0)) 
    821821         ERROR("CDomain::checkBounds(void)", 
    822822               << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] " 
Note: See TracChangeset for help on using the changeset viewer.