Changeset 691 for XIOS

Timestamp:

09/15/15 17:31:24 (9 years ago)

Author:

mhnguyen

Message:

Correcting minor bugs after merging

Test
+) On Curie
+) All tests pass

Location:

XIOS/trunk

Files:

• bld.cfg (modified) (1 diff)
• src/interface/c_attr/icdomain_attr.cpp (modified) (1 diff)
• src/interface/fortran_attr/domain_interface_attr.F90 (modified) (1 diff)
• src/node/domain.cpp (modified) (4 diffs)

XIOS/trunk/bld.cfg

@@ -35 +35 @@
 bld::target xios_server.exe test_remap.exe
 #bld::target test_new_features.exe test_unstruct_complete.exe 
-#bld::target test_client.exe test_complete.exe
+bld::target test_client.exe test_complete.exe
 bld::exe_dep
 

XIOS/trunk/src/interface/c_attr/icdomain_attr.cpp

@@ -386 +386 @@
 
 
-  void cxios_set_domain_i_index(domain_Ptr domain_hdl, int* i_index, int extent1)
+  void cxios_set_domain_i_index(domain_Ptr domain_hdl, int* i_index, int* extent)
   {
     CTimer::get("XIOS").resume();

XIOS/trunk/src/interface/fortran_attr/domain_interface_attr.F90

@@ -315 +315 @@
 
 
-    SUBROUTINE cxios_set_domain_i_index(domain_hdl, i_index, extent1) BIND(C)
+    SUBROUTINE cxios_set_domain_i_index(domain_hdl, i_index, extent) BIND(C)
       USE ISO_C_BINDING
       INTEGER (kind = C_INTPTR_T), VALUE       :: domain_hdl

XIOS/trunk/src/node/domain.cpp

@@ -787 +787 @@
        }
 
-       if (!bounds_lon_1d.isEmpty() && nvertex.getValue() != bounds_lon_1d.extent(1))
+       if (!bounds_lon_1d.isEmpty() && nvertex.getValue() != bounds_lon_1d.extent(0))
          ERROR("CDomain::checkBounds(void)",
                << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] "
@@ -794 +794 @@
                << " but nvertex is " << nvertex.getValue() << ".");
 
-       if (!bounds_lon_2d.isEmpty() && nvertex.getValue() != bounds_lon_2d.extent(2))
+       if (!bounds_lon_2d.isEmpty() && nvertex.getValue() != bounds_lon_2d.extent(0))
          ERROR("CDomain::checkBounds(void)",
                << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] "
@@ -811 +811 @@
                << "Since 'bounds_lon_2d' is defined, 'lonvalue_2d' must be defined too." << std::endl);
 
-       if (!bounds_lat_1d.isEmpty() && nvertex.getValue() != bounds_lat_1d.extent(1))
+       if (!bounds_lat_1d.isEmpty() && nvertex.getValue() != bounds_lat_1d.extent(0))
          ERROR("CDomain::checkBounds(void)",
                << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] "
@@ -818 +818 @@
                << " but nvertex is " << nvertex.getValue() << ".");
 
-       if (!bounds_lat_2d.isEmpty() && nvertex.getValue() != bounds_lat_2d.extent(2))
+       if (!bounds_lat_2d.isEmpty() && nvertex.getValue() != bounds_lat_2d.extent(0))
          ERROR("CDomain::checkBounds(void)",
                << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] "