Changeset 2471 for XIOS3/trunk/src
- Timestamp:
- 03/07/23 10:58:57 (16 months ago)
- Location:
- XIOS3/trunk/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS3/trunk/src/attribute_map.cpp
r2388 r2471 402 402 { 403 403 oss << ", " << it->second->getName() << "_"; 404 if ( oss.tellp() - startPos > 90)404 if ((long)oss.tellp() - startPos > 90) 405 405 { 406 406 oss << " &" << iendl; … … 452 452 { 453 453 oss << ", " << it->second->getName() << "_"; 454 if ( oss.tellp() - startPos > 90)454 if ((long)oss.tellp() - startPos > 90) 455 455 { 456 456 oss << " &" << iendl; … … 502 502 { 503 503 oss << ", " << it->second->getName() << "_"; 504 if ( oss.tellp() - startPos > 90)504 if ((long)oss.tellp() - startPos > 90) 505 505 { 506 506 oss << " &" << iendl; … … 552 552 { 553 553 oss << ", " << it->second->getName(); 554 if ( oss.tellp() - startPos > 90)554 if ((long)oss.tellp() - startPos > 90) 555 555 { 556 556 oss << " &" << iendl; … … 587 587 { 588 588 oss << ", " << it->second->getName(); 589 if ( oss.tellp() - startPos > 90)589 if ((long)oss.tellp() - startPos > 90) 590 590 { 591 591 oss << " &" << iendl; … … 614 614 { 615 615 oss << ", " << it->second->getName(); 616 if ( oss.tellp() - startPos > 90)616 if ((long)oss.tellp() - startPos > 90) 617 617 { 618 618 oss << " &" << iendl; … … 649 649 { 650 650 oss << ", " << it->second->getName(); 651 if ( oss.tellp() - startPos > 90)651 if ((long)oss.tellp() - startPos > 90) 652 652 { 653 653 oss << " &" << iendl; … … 676 676 { 677 677 oss << ", " << it->second->getName(); 678 if ( oss.tellp() - startPos > 90)678 if ((long)oss.tellp() - startPos > 90) 679 679 { 680 680 oss << " &" << iendl; … … 711 711 { 712 712 oss << ", " << it->second->getName(); 713 if ( oss.tellp() - startPos > 90)713 if ((long)oss.tellp() - startPos > 90) 714 714 { 715 715 oss << " &" << iendl; … … 738 738 { 739 739 oss << ", " << it->second->getName(); 740 if ( oss.tellp() - startPos > 90)740 if ((long)oss.tellp() - startPos > 90) 741 741 { 742 742 oss << " &" << iendl; … … 776 776 { 777 777 oss << ", " << it->second->getName(); 778 if ( oss.tellp() - startPos > 90)778 if ((long)oss.tellp() - startPos > 90) 779 779 { 780 780 oss << " &" << iendl; … … 803 803 { 804 804 oss << ", " << it->second->getName(); 805 if ( oss.tellp() - startPos > 90)805 if ((long)oss.tellp() - startPos > 90) 806 806 { 807 807 oss << " &" << iendl; … … 841 841 { 842 842 oss << ", " << it->second->getName(); 843 if ( oss.tellp() - startPos > 90)843 if ((long)oss.tellp() - startPos > 90) 844 844 { 845 845 oss << " &" << iendl; … … 868 868 { 869 869 oss << ", " << it->second->getName(); 870 if ( oss.tellp() - startPos > 90)870 if ((long)oss.tellp() - startPos > 90) 871 871 { 872 872 oss << " &" << iendl; … … 906 906 { 907 907 oss << ", " << it->second->getName(); 908 if ( oss.tellp() - startPos > 90)908 if ((long)oss.tellp() - startPos > 90) 909 909 { 910 910 oss << " &" << iendl; -
XIOS3/trunk/src/interface/c/icdata.cpp
r2426 r2471 66 66 if (!cstr2string(client_id, len_client_id, str)) return; 67 67 68 CTimer::get("XIOS").resume();69 CTimer::get("XIOS init").resume();70 68 int initialized; 71 69 MPI_Initialized(&initialized); 72 if (initialized) local_comm=MPI_Comm_f2c(*f_local_comm); 70 if (initialized) 71 { 72 CTimer::get("XIOS").resume(); 73 CTimer::get("XIOS init").resume(); 74 local_comm=MPI_Comm_f2c(*f_local_comm); 75 } 73 76 else local_comm=MPI_COMM_NULL; 74 77 CXios::initClientSide(str, local_comm, return_comm); 75 78 *f_return_comm=MPI_Comm_c2f(return_comm); 76 CTimer::get("XIOS init").suspend(); 77 CTimer::get("XIOS").suspend(); 79 if (initialized) 80 { 81 CTimer::get("XIOS init").suspend(); 82 CTimer::get("XIOS").suspend(); 83 } 78 84 } 79 85 CATCH_DUMP_STACK -
XIOS3/trunk/src/log_type.hpp
r2341 r2471 6 6 #include <cstdint> 7 7 #include <unordered_map> 8 #include <map> 8 9 9 10 //#include "cxios.hpp"
Note: See TracChangeset
for help on using the changeset viewer.