Changeset 1646 for XIOS/dev/dev_trunk_omp/src/object_template_impl.hpp

Timestamp:

01/31/19 12:12:52 (5 years ago)

Author:

yushan

Message:

branch merged with trunk @1645. arch file (ep&mpi) added for ADA

File:

• XIOS/dev/dev_trunk_omp/src/object_template_impl.hpp (modified) (4 diffs)

XIOS/dev/dev_trunk_omp/src/object_template_impl.hpp

@@ -109 +109 @@
    template <class T>
       void CObjectTemplate<T>::parse(xml::CXMLNode & node)
+   TRY
    {
       xml::THashAttributes attributes = node.getAttributes();
       CAttributeMap::setAttributes(attributes);
    }
+   CATCH
 
    //---------------------------------------------------------------
@@ -362 +364 @@
     *buffer>>attrId;
     CAttribute* attr=attrMap[attrId];
-    info(50) << "attribut recu " << attrId << "  ";
-    if (attr->isEmpty()) info(50) << "--> empty" << endl;
-    else info(50) /*<attr->getValue()*/ << endl;
+    #pragma omp critical (_output)
+    {
+      info(50) << "attribut recu " << attrId << "  ";
+    }
+    if (attr->isEmpty()) 
+    {
+      #pragma omp critical (_output)
+      {
+        info(50) << "--> empty" << endl;
+      }
+    }
+    else
+    {
+      #pragma omp critical (_output)
+      {
+        info(50) /*<attr->getValue()*/ << endl;
+      }
+    }
     *buffer>>*attr;
-     info(50) << "attribut recu " << attrId << "  ";
-    if (attr->isEmpty()) info(50) << "--> empty" << endl;
-    else info(50) /*attr->getValue()*/ << endl;
+    #pragma omp critical (_output)
+    {
+      info(50) << "attribut recu " << attrId << "  ";
+    }
+    if (attr->isEmpty())
+    {
+      #pragma omp critical (_output)
+      {
+        info(50) << "--> empty" << endl;
+      }
+    }
+    else
+    {
+      #pragma omp critical (_output)
+      {
+        info(50) /*attr->getValue()*/ << endl;
+      }
+    }
   }
 
@@ -481 +513 @@
      oss << iendl;
      oss << "#include <boost/multi_array.hpp>" << iendl;
-     oss << "#include <boostXXX/shared_ptr.hpp>" << iendl;
      oss << "#include \"xios.hpp\"" << iendl;
      oss << "#include \"attribute_template.hpp\"" << iendl;
@@ -515 +546 @@
      oss << "INTERFACE" << iendl++;
      oss << "! Do not call directly / interface FORTRAN 2003 <-> C99";
-     SuperClassMap::generateFortran2003Interface(oss,className);
+     SuperClassMap::generateFortran2003Interface(oss, className);
      oss << iendl--;
      oss << "END INTERFACE" << iendl--;