Changeset 1153 for XIOS/dev/branch_yushan_merged/src/node/file.cpp
- Timestamp:
- 06/02/17 17:53:25 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/branch_yushan_merged/src/node/file.cpp
r1149 r1153 578 578 bool isCollective = par_access.isEmpty() || par_access == par_access_attr::collective; 579 579 580 #ifdef _usingEP 581 if(omp_get_num_threads() != 1 ) multifile = true; 582 #endif 583 580 584 if (isOpen) data_out->closeFile(); 581 585 if (time_counter_name.isEmpty()) data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), static_cast< ::MPI_Comm >(fileComm.mpi_comm), multifile, isCollective)); … … 609 613 610 614 // It would probably be better to call initFile() somehow 615 611 616 MPI_Comm_dup(client->intraComm, &fileComm); 612 617 if (time_counter_name.isEmpty()) time_counter_name = "time_counter"; 613 618 614 //#pragma omp critical (_checkFile) 615 checkFile(); 619 //#pragma omp critical (_readAttributesOfEnabledFieldsInReadMode_) 620 //{ 621 checkFile(); // calls nc_open 616 622 617 623 for (int idx = 0; idx < enabledFields.size(); ++idx) … … 627 633 628 634 // Read necessary value from file 629 this->data_in->readFieldAttributesValues(enabledFields[idx]); 630 635 #pragma omp critical (_func) 636 { 637 //checkFile(); 638 this->data_in->readFieldAttributesValues(enabledFields[idx]); 639 //close(); 640 } 641 631 642 // Fill attributes for base reference 632 643 enabledFields[idx]->solveGridDomainAxisBaseRef(); … … 634 645 635 646 // Now everything is ok, close it 636 //close(); 647 close(); 648 //} 649 650 //if (fileComm != MPI_COMM_NULL) MPI_Comm_free(&fileComm); 651 637 652 } 638 653
Note: See TracChangeset
for help on using the changeset viewer.