Changeset 1074


Ignore:
Timestamp:
03/15/17 18:29:03 (4 years ago)
Author:
yushan
Message:

save modif

Location:
XIOS/dev/branch_yushan/src
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/branch_yushan/src/client.cpp

    r1073 r1074  
    312312      fileNameClient << fileName << "_" << std::setfill('0') << std::setw(numDigit) << getRank() << ext; 
    313313      printf("getrank() = %d, file name = %s\n", getRank(), fileNameClient.str().c_str()); 
    314       #pragma omp critical(_output) 
    315       { 
     314       
    316315        fb->open(fileNameClient.str().c_str(), std::ios::out); 
    317316        if (!fb->is_open()) 
    318317          ERROR("void CClient::openStream(const StdString& fileName, const StdString& ext, std::filebuf* fb)", 
    319318              << std::endl << "Can not open <" << fileNameClient << "> file to write the client log(s).");   
    320       } 
     319       
    321320       
    322321    } 
  • XIOS/dev/branch_yushan/src/cxios.cpp

    r1073 r1074  
    3535  {     
    3636    set_new_handler(noMemory); 
    37     #pragma omp master 
     37    #pragma omp critical 
    3838    { 
    3939      parseFile(rootFile);   
  • XIOS/dev/branch_yushan/src/cxios.hpp

    r1073 r1074  
    5353 
    5454     static bool printLogs2Files; //!< Printing out logs into files 
    55      //#pragma omp threadprivate(printLogs2Files) 
     55     #pragma omp threadprivate(printLogs2Files) 
    5656 
    5757     static bool usingOasis ; //!< Using Oasis 
  • XIOS/dev/branch_yushan/src/interface/c/icdata.cpp

    r1072 r1074  
    129129     CTimer::get("XIOS context finalize").resume(); 
    130130      
     131     printf("Check : calling cxios_context_finalize\n"); 
    131132     CContext* context = CContext::getCurrent(); 
    132133     context->finalize(); 
  • XIOS/dev/branch_yushan/src/node/context.cpp

    r1070 r1074  
    356356   void CContext::finalize(void) 
    357357   { 
     358       
    358359      if (!finalized) 
    359360      { 
  • XIOS/dev/branch_yushan/src/test/test_omp.f90

    r1073 r1074  
    7979  print*, "xios init OK", rank, size 
    8080 
    81   CALL xios_context_initialize("test",comm) 
     81!   CALL xios_context_initialize("test",comm) 
    8282 
    83    print*, "xios_context init OK", rank, size   
     83!   print*, "xios_context init OK", rank, size  
     84 
     85  !CALL xios_context_finalize() 
     86 
     87   
     88  !print*, "xios_context finalize OK", rank, size  
    8489 
    8590  !$omp end parallel 
     91 
     92 
    8693   
    8794  CALL xios_context_initialize("test",comm) 
  • XIOS/dev/branch_yushan/src/xml_node.hpp

    r1073 r1074  
    4949 
    5050            static StdString RootName; 
    51             #pragma omp threadprivate(RootName) 
     51            //#pragma omp threadprivate(RootName) 
    5252 
    5353      }; //class CXMLParser 
Note: See TracChangeset for help on using the changeset viewer.