Changeset 1549 for XIOS

Timestamp:

06/25/18 12:12:42 (6 years ago)

Author:

oabramkina

Message:

Adding a new domain transformation "domain_extract".

For now it has only the functionalities of zoom.

Location:

XIOS/trunk/src

Files:

• config/domain_attribute.conf (modified) (1 diff)
• config/domain_attribute_private.conf (modified) (1 diff)
• config/extract_domain_attribute.conf (added)
• config/node_type.conf (modified) (1 diff)
• distribution_client.cpp (added)
• distribution_client.hpp (added)
• generate_fortran_interface.cpp (modified) (2 diffs)
• group_factory_decl.cpp (modified) (1 diff)
• group_template_decl.cpp (modified) (1 diff)
• node/domain.cpp (modified) (9 diffs)
• node/extract_domain.cpp (added)
• node/extract_domain.hpp (added)
• node/node_enum.hpp (modified) (1 diff)
• node/node_type.hpp (modified) (1 diff)
• node/transformation_enum.hpp (modified) (1 diff)
• object_factory_decl.cpp (modified) (2 diffs)
• object_template_decl.cpp (modified) (2 diffs)
• transformation/algo_types.hpp (modified) (1 diff)
• transformation/domain_algorithm_extract.cpp (added)
• transformation/domain_algorithm_extract.hpp (added)
• transformation/grid_transformation_selector.cpp (modified) (1 diff)
• type/type_util.hpp (modified) (2 diffs)
• xml_parser_decl.cpp (modified) (1 diff)

XIOS/trunk/src/config/domain_attribute.conf

@@ -62 +62 @@
 DECLARE_ATTRIBUTE(StdString, domain_ref)
 DECLARE_ATTRIBUTE(int,       prec)
+
+DECLARE_ATTRIBUTE_PRIVATE(int,  global_zoom_ibegin)
+DECLARE_ATTRIBUTE_PRIVATE(int,  global_zoom_ni)
+DECLARE_ATTRIBUTE_PRIVATE(int,  global_zoom_jbegin)
+DECLARE_ATTRIBUTE_PRIVATE(int,  global_zoom_nj)

XIOS/trunk/src/config/domain_attribute_private.conf

@@ -26 +26 @@
 DECLARE_ARRAY_PRIVATE(double, 2, bounds_latvalue_unstructured_read_from_file)
 
-DECLARE_ATTRIBUTE_PRIVATE(int,  global_zoom_ibegin)
-DECLARE_ATTRIBUTE_PRIVATE(int,  global_zoom_ni)
-DECLARE_ATTRIBUTE_PRIVATE(int,  global_zoom_jbegin)
-DECLARE_ATTRIBUTE_PRIVATE(int,  global_zoom_nj)
+//DECLARE_ATTRIBUTE_PRIVATE(int,  global_zoom_ibegin)
+//DECLARE_ATTRIBUTE_PRIVATE(int,  global_zoom_ni)
+//DECLARE_ATTRIBUTE_PRIVATE(int,  global_zoom_jbegin)
+//DECLARE_ATTRIBUTE_PRIVATE(int,  global_zoom_nj)
 
 // Local zoom information

XIOS/trunk/src/config/node_type.conf

@@ -105 +105 @@
 #ifdef __XIOS_CReorderDomain__
    DECLARE_NODE(ReorderDomain, reorder_domain)
-#endif //__XIOS_CReduceScalarToScalar_
+#endif //__XIOS_CReorderDomain_
+
+#ifdef __XIOS_CExtractDomain__
+   DECLARE_NODE(ExtractDomain, extract_domain)
+#endif //__XIOS_CExtractDomain__
 
 #ifdef __XIOS_CContext__

XIOS/trunk/src/generate_fortran_interface.cpp

@@ -36 +36 @@
   CExpandDomain expandDomain;
   CReorderDomain reorderDomain;
+  CExtractDomain extractDomain;
 
   CInterpolateAxis interpolateAxis;
@@ -315 +316 @@
   reorderDomain.generateFortranInterface(file);
 
+  file.open((path+"extract_domain_interface_attr.F90").c_str());
+  extractDomain.generateFortran2003Interface(file);
+  file.close();
+
+  file.open((path+"icextract_domain_attr.cpp").c_str());
+  extractDomain.generateCInterface(file);
+  file.close();
+
+  file.open((path+"iextract_domain_attr.F90").c_str());
+  extractDomain.generateFortranInterface(file);
+
   file.close();
   

XIOS/trunk/src/group_factory_decl.cpp

@@ -44 +44 @@
   macro(CReduceScalarToScalarGroup)
   macro(CReorderDomainGroup)
+  macro(CExtractDomainGroup)
 }

XIOS/trunk/src/group_template_decl.cpp

@@ -33 +33 @@
   macro(ReduceScalarToScalar)
   macro(ReorderDomain)
+  macro(ExtractDomain)
 
 }

XIOS/trunk/src/node/domain.cpp

@@ -77 +77 @@
      m["expand_domain"] = TRANS_EXPAND_DOMAIN;
      m["reorder_domain"] = TRANS_REORDER_DOMAIN;
+     m["extract_domain"] = TRANS_EXTRACT_DOMAIN;
    }
 
@@ -1212 +1213 @@
 
    /*
-     Fill in longitude and latitude value from clients (or models) into internal values lonvalue, latvalue which
-     will be used by XIOS.
+     Fill in longitude, latitude, bounds, and area into internal values (lonvalue, latvalue, bounds_lonvalue, bounds_latvalue, areavalue)
+     which will be used by XIOS.
    */
    void CDomain::completeLonLatClient(void)
@@ -1219 +1220 @@
      bool lonlatValueExisted = (0 != lonvalue.numElements()) || (0 != latvalue.numElements());
      checkBounds() ;
+     checkArea() ;
+
      if (!lonvalue_2d.isEmpty() && !lonlatValueExisted)
      {
@@ -1313 +1316 @@
        }
      }
+
+     if (!area.isEmpty() && areavalue.isEmpty())
+     {
+        areavalue.resize(ni*nj);
+       for (int j = 0; j < nj; ++j)
+       {
+         for (int i = 0; i < ni; ++i)
+         {
+           int k = j * ni + i;
+           areavalue(k) = area(i,j);
+         }
+       }
+     }
    }
 
@@ -1455 +1471 @@
                << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] "
                << "'bounds_lon_1d' dimension is not compatible with 'nvertex'." << std::endl
-               << "'bounds_lon_1d' dimension is " << bounds_lon_1d.extent(1)
+               << "'bounds_lon_1d' dimension is " << bounds_lon_1d.extent(0)
                << " but nvertex is " << nvertex.getValue() << ".");
 
@@ -1462 +1478 @@
                << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] "
                << "'bounds_lon_2d' dimension is not compatible with 'nvertex'." << std::endl
-               << "'bounds_lon_2d' dimension is " << bounds_lon_2d.extent(2)
+               << "'bounds_lon_2d' dimension is " << bounds_lon_2d.extent(0)
                << " but nvertex is " << nvertex.getValue() << ".");
 
@@ -1479 +1495 @@
                << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] "
                << "'bounds_lat_1d' dimension is not compatible with 'nvertex'." << std::endl
-               << "'bounds_lat_1d' dimension is " << bounds_lat_1d.extent(1)
+               << "'bounds_lat_1d' dimension is " << bounds_lat_1d.extent(0)
                << " but nvertex is " << nvertex.getValue() << ".");
 
@@ -1486 +1502 @@
                << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] "
                << "'bounds_lat_2d' dimension is not compatible with 'nvertex'." << std::endl
-               << "'bounds_lat_2d' dimension is " << bounds_lat_2d.extent(2)
+               << "'bounds_lat_2d' dimension is " << bounds_lat_2d.extent(0)
                << " but nvertex is " << nvertex.getValue() << ".");
 
@@ -1525 +1541 @@
                << "Area size is " << area.extent(0) << " x " << area.extent(1) << ".");
        }
-       if (areavalue.isEmpty())
-       {
-          areavalue.resize(ni*nj);
-         for (int j = 0; j < nj; ++j)
-         {
-           for (int i = 0; i < ni; ++i)
-           {
-             int k = j * ni + i;
-             areavalue(k) = area(i,j);
-           }
-         }
-       }
+//       if (areavalue.isEmpty())
+//       {
+//          areavalue.resize(ni*nj);
+//         for (int j = 0; j < nj; ++j)
+//         {
+//           for (int i = 0; i < ni; ++i)
+//           {
+//             int k = j * ni + i;
+//             areavalue(k) = area(i,j);
+//           }
+//         }
+//       }
      }
    }

XIOS/trunk/src/node/node_enum.hpp

@@ -38 +38 @@
          eDuplicateScalarToAxis,
          eReduceScalarToScalar,
-         eReorderDomain
+         eReorderDomain,
+         eExtractDomain
        } ENodeType;
 

XIOS/trunk/src/node/node_type.hpp

@@ -29 +29 @@
 #include "reduce_scalar_to_scalar.hpp"
 #include "reorder_domain.hpp"
+#include "extract_domain.hpp"
 
 

XIOS/trunk/src/node/transformation_enum.hpp

@@ -24 +24 @@
         TRANS_DUPLICATE_SCALAR_TO_AXIS = 15,
         TRANS_REDUCE_SCALAR_TO_SCALAR = 16,
-        TRANS_REORDER_DOMAIN = 17
+        TRANS_REORDER_DOMAIN = 17,
+        TRANS_EXTRACT_DOMAIN = 18
       } ETranformationType;
 

XIOS/trunk/src/object_factory_decl.cpp

@@ -45 +45 @@
   macro(CReduceScalarToScalar)
   macro(CReorderDomain)
+  macro(CExtractDomain)
   
   macro(CFieldGroup)
@@ -72 +73 @@
   macro(CReduceScalarToScalarGroup)
   macro(CReorderDomainGroup)
+  macro(CExtractDomainGroup)
 }

XIOS/trunk/src/object_template_decl.cpp

@@ -32 +32 @@
   template class CObjectTemplate<CReduceScalarToScalar>;
   template class CObjectTemplate<CReorderDomain>;
+  template class CObjectTemplate<CExtractDomain>;
   
   template class CObjectTemplate<CContextGroup>;
@@ -59 +60 @@
   template class CObjectTemplate<CReduceScalarToScalarGroup>;
   template class CObjectTemplate<CReorderDomainGroup>;
+  template class CObjectTemplate<CExtractDomainGroup>;
 }

XIOS/trunk/src/transformation/algo_types.hpp

@@ -30 +30 @@
 #include "scalar_algorithm_reduce_scalar.hpp"
 #include "domain_algorithm_reorder.hpp"
+#include "domain_algorithm_extract.hpp"
 
 

XIOS/trunk/src/transformation/grid_transformation_selector.cpp

@@ -40 +40 @@
   CDomainAlgorithmExpand::registerTrans();
   CDomainAlgorithmReorder::registerTrans();
+  CDomainAlgorithmExtract::registerTrans();
 }
 

XIOS/trunk/src/type/type_util.hpp

@@ -58 +58 @@
     class CReorderDomain;
     class CReorderDomainGroup;
+    class CExtractDomain;
+    class CExtractDomainGroup;
      
   template <typename T> inline string getStrType(void);
@@ -132 +134 @@
   macro(CReorderDomain)
   macro(CReorderDomainGroup)
+  macro(CExtractDomain)
+  macro(CExtractDomainGroup)
   
 #undef macro

XIOS/trunk/src/xml_parser_decl.cpp

@@ -38 +38 @@
     macro( ReduceScalarToScalar )
     macro( ReorderDomain )
+    macro( ExtractDomain )
   }
 }