- Timestamp:
- 10/03/14 10:51:38 (10 years ago)
- Location:
- XIOS/trunk/src
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/client.cpp
r491 r493 92 92 int clientLeader=leaders[hashClient] ; 93 93 serverLeader=leaders[hashServer] ; 94 95 int intraCommSize, intraCommRank ; 96 MPI_Comm_size(intraComm,&intraCommSize) ; 97 MPI_Comm_rank(intraComm,&intraCommRank) ; 98 info(50)<<"intercommCreate::client "<<rank<<" intraCommSize : "<<intraCommSize 99 <<" intraCommRank :"<<intraCommRank<<" clientLeader "<< serverLeader<<endl ; 94 100 MPI_Intercomm_create(intraComm,0,CXios::globalComm,serverLeader,0,&interComm) ; 95 101 } -
XIOS/trunk/src/node/domain.cpp
r479 r493 171 171 ibegin.getValue() < 1 || iend.getValue() > ni_glo.getValue()) 172 172 { 173 cout<<ni_glo<<" "<<ni<<" "<<ibegin<<" "<<iend<<endl;174 173 175 174 ERROR("CDomain::checkAttributes(void)", -
XIOS/trunk/src/node/field.cpp
r482 r493 792 792 instantField->freq_op=freq_op ; 793 793 averageField-> processEnabledField() ; 794 cout<<" outputfreq of averageField "<< freq_op <<" "<<instantField->freq_op<<" "<< averageField->freq_write << endl ;795 794 instantField->SuperClassAttribute::setAttributes(averageField, true); 796 795 instantField->field_ref.reset() ; -
XIOS/trunk/src/parse_expr/yacc_parser.cpp
r458 r493 74 74 #include <string> 75 75 #include <iostream> 76 #include "exception.hpp" 77 76 78 using namespace std ; 79 using namespace xios ; 80 77 81 extern "C" 78 82 { … … 101 105 102 106 /* Line 189 of yacc.c */ 103 #line 10 4"yacc_parser.cpp"107 #line 108 "yacc_parser.cpp" 104 108 105 109 /* Enabling traces. */ … … 151 155 152 156 /* Line 214 of yacc.c */ 153 #line 3 2"yacc_parser.yacc"157 #line 36 "yacc_parser.yacc" 154 158 155 159 std::string* str ; /* symbol table index */ … … 159 163 160 164 /* Line 214 of yacc.c */ 161 #line 16 2"yacc_parser.cpp"165 #line 166 "yacc_parser.cpp" 162 166 } YYSTYPE; 163 167 # define YYSTYPE_IS_TRIVIAL 1 … … 171 175 172 176 /* Line 264 of yacc.c */ 173 #line 17 4"yacc_parser.cpp"177 #line 178 "yacc_parser.cpp" 174 178 175 179 #ifdef short … … 468 472 static const yytype_uint8 yyrline[] = 469 473 { 470 0, 5 4, 54, 55, 59, 60, 61, 62, 63, 64,471 6 5, 66, 67, 68, 72, 73, 74, 75, 76, 77,472 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,473 88, 89, 90474 0, 58, 58, 59, 63, 64, 65, 66, 67, 68, 475 69, 70, 71, 72, 76, 77, 78, 79, 80, 81, 476 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 477 92, 93, 94 474 478 }; 475 479 #endif … … 1422 1426 1423 1427 /* Line 1455 of yacc.c */ 1424 #line 5 4"yacc_parser.yacc"1425 { cout<<"The end: \n";;}1428 #line 58 "yacc_parser.yacc" 1429 { ;} 1426 1430 break; 1427 1431 … … 1429 1433 1430 1434 /* Line 1455 of yacc.c */ 1431 #line 5 5"yacc_parser.yacc"1432 { cout<<"Parsed END..."<<endl ;parsed=(yyvsp[(1) - (2)].node) ;;}1435 #line 59 "yacc_parser.yacc" 1436 { parsed=(yyvsp[(1) - (2)].node) ;;} 1433 1437 break; 1434 1438 … … 1436 1440 1437 1441 /* Line 1455 of yacc.c */ 1438 #line 59"yacc_parser.yacc"1442 #line 63 "yacc_parser.yacc" 1439 1443 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::scalarDouble,(yyvsp[(1) - (1)].str)); delete (yyvsp[(1) - (1)].str) ;} 1440 1444 break; … … 1443 1447 1444 1448 /* Line 1455 of yacc.c */ 1445 #line 6 0"yacc_parser.yacc"1449 #line 64 "yacc_parser.yacc" 1446 1450 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::scalarVariable,(yyvsp[(1) - (1)].str)) ; delete (yyvsp[(1) - (1)].str);} 1447 1451 break; … … 1450 1454 1451 1455 /* Line 1455 of yacc.c */ 1452 #line 6 1"yacc_parser.yacc"1456 #line 65 "yacc_parser.yacc" 1453 1457 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opScalarScalar,"add") ; (yyval.node)->addChild((yyvsp[(1) - (3)].node)) ; (yyval.node)->addChild((yyvsp[(3) - (3)].node)); ;} 1454 1458 break; … … 1457 1461 1458 1462 /* Line 1455 of yacc.c */ 1459 #line 6 2"yacc_parser.yacc"1463 #line 66 "yacc_parser.yacc" 1460 1464 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opScalarScalar,"minus") ; (yyval.node)->addChild((yyvsp[(1) - (3)].node)) ; (yyval.node)->addChild((yyvsp[(3) - (3)].node)); ;} 1461 1465 break; … … 1464 1468 1465 1469 /* Line 1455 of yacc.c */ 1466 #line 6 3"yacc_parser.yacc"1470 #line 67 "yacc_parser.yacc" 1467 1471 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opScalarScalar,"mult") ; (yyval.node)->addChild((yyvsp[(1) - (3)].node)) ; (yyval.node)->addChild((yyvsp[(3) - (3)].node)); ;} 1468 1472 break; … … 1471 1475 1472 1476 /* Line 1455 of yacc.c */ 1473 #line 6 4"yacc_parser.yacc"1477 #line 68 "yacc_parser.yacc" 1474 1478 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opScalarScalar,"div") ; (yyval.node)->addChild((yyvsp[(1) - (3)].node)) ; (yyval.node)->addChild((yyvsp[(3) - (3)].node)); ;} 1475 1479 break; … … 1478 1482 1479 1483 /* Line 1455 of yacc.c */ 1480 #line 6 5"yacc_parser.yacc"1484 #line 69 "yacc_parser.yacc" 1481 1485 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opScalar,"neg") ; (yyval.node)->addChild((yyvsp[(2) - (2)].node)); ;} 1482 1486 break; … … 1485 1489 1486 1490 /* Line 1455 of yacc.c */ 1487 #line 66"yacc_parser.yacc"1491 #line 70 "yacc_parser.yacc" 1488 1492 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opScalarScalar,"pow") ; (yyval.node)->addChild((yyvsp[(1) - (3)].node)) ; (yyval.node)->addChild((yyvsp[(3) - (3)].node)); ;} 1489 1493 break; … … 1492 1496 1493 1497 /* Line 1455 of yacc.c */ 1494 #line 67"yacc_parser.yacc"1498 #line 71 "yacc_parser.yacc" 1495 1499 { (yyval.node)=(yyvsp[(2) - (3)].node) ; ;} 1496 1500 break; … … 1499 1503 1500 1504 /* Line 1455 of yacc.c */ 1501 #line 68"yacc_parser.yacc"1505 #line 72 "yacc_parser.yacc" 1502 1506 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opScalar,(yyvsp[(1) - (4)].str)) ; (yyval.node)->addChild((yyvsp[(3) - (4)].node)) ; delete (yyvsp[(1) - (4)].str) ;} 1503 1507 break; … … 1506 1510 1507 1511 /* Line 1455 of yacc.c */ 1508 #line 7 2"yacc_parser.yacc"1512 #line 76 "yacc_parser.yacc" 1509 1513 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::fieldInstant,(yyvsp[(1) - (1)].str)); delete (yyvsp[(1) - (1)].str);} 1510 1514 break; … … 1513 1517 1514 1518 /* Line 1455 of yacc.c */ 1515 #line 7 3"yacc_parser.yacc"1519 #line 77 "yacc_parser.yacc" 1516 1520 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::fieldAverage,(yyvsp[(1) - (1)].str)); delete (yyvsp[(1) - (1)].str);} 1517 1521 break; … … 1520 1524 1521 1525 /* Line 1455 of yacc.c */ 1522 #line 7 4"yacc_parser.yacc"1526 #line 78 "yacc_parser.yacc" 1523 1527 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opFieldField,"add") ; (yyval.node)->addChild((yyvsp[(1) - (3)].node)) ; (yyval.node)->addChild((yyvsp[(3) - (3)].node)); ;} 1524 1528 break; … … 1527 1531 1528 1532 /* Line 1455 of yacc.c */ 1529 #line 7 5"yacc_parser.yacc"1533 #line 79 "yacc_parser.yacc" 1530 1534 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opFieldField,"minus") ; (yyval.node)->addChild((yyvsp[(1) - (3)].node)) ; (yyval.node)->addChild((yyvsp[(3) - (3)].node)); ;} 1531 1535 break; … … 1534 1538 1535 1539 /* Line 1455 of yacc.c */ 1536 #line 76"yacc_parser.yacc"1540 #line 80 "yacc_parser.yacc" 1537 1541 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opFieldField,"mult") ; (yyval.node)->addChild((yyvsp[(1) - (3)].node)) ; (yyval.node)->addChild((yyvsp[(3) - (3)].node)); ;} 1538 1542 break; … … 1541 1545 1542 1546 /* Line 1455 of yacc.c */ 1543 #line 77"yacc_parser.yacc"1547 #line 81 "yacc_parser.yacc" 1544 1548 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opFieldField,"div") ; (yyval.node)->addChild((yyvsp[(1) - (3)].node)) ; (yyval.node)->addChild((yyvsp[(3) - (3)].node)); ;} 1545 1549 break; … … 1548 1552 1549 1553 /* Line 1455 of yacc.c */ 1550 #line 78"yacc_parser.yacc"1554 #line 82 "yacc_parser.yacc" 1551 1555 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opField,"neg") ; (yyval.node)->addChild((yyvsp[(2) - (2)].node));;} 1552 1556 break; … … 1555 1559 1556 1560 /* Line 1455 of yacc.c */ 1557 #line 79"yacc_parser.yacc"1561 #line 83 "yacc_parser.yacc" 1558 1562 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opFieldField,"pow") ; (yyval.node)->addChild((yyvsp[(1) - (3)].node)) ; (yyval.node)->addChild((yyvsp[(3) - (3)].node)); ;} 1559 1563 break; … … 1562 1566 1563 1567 /* Line 1455 of yacc.c */ 1564 #line 8 0"yacc_parser.yacc"1568 #line 84 "yacc_parser.yacc" 1565 1569 { (yyval.node)=(yyvsp[(2) - (3)].node) ;;} 1566 1570 break; … … 1569 1573 1570 1574 /* Line 1455 of yacc.c */ 1571 #line 8 1"yacc_parser.yacc"1575 #line 85 "yacc_parser.yacc" 1572 1576 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opFieldScalar,"add") ; (yyval.node)->addChild((yyvsp[(1) - (3)].node)) ; (yyval.node)->addChild((yyvsp[(3) - (3)].node)); ;} 1573 1577 break; … … 1576 1580 1577 1581 /* Line 1455 of yacc.c */ 1578 #line 8 2"yacc_parser.yacc"1582 #line 86 "yacc_parser.yacc" 1579 1583 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opScalarField,"add") ; (yyval.node)->addChild((yyvsp[(1) - (3)].node)) ; (yyval.node)->addChild((yyvsp[(3) - (3)].node)); ;} 1580 1584 break; … … 1583 1587 1584 1588 /* Line 1455 of yacc.c */ 1585 #line 8 3"yacc_parser.yacc"1589 #line 87 "yacc_parser.yacc" 1586 1590 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opFieldScalar,"minus") ; (yyval.node)->addChild((yyvsp[(1) - (3)].node)) ; (yyval.node)->addChild((yyvsp[(3) - (3)].node)); ;} 1587 1591 break; … … 1590 1594 1591 1595 /* Line 1455 of yacc.c */ 1592 #line 8 4"yacc_parser.yacc"1596 #line 88 "yacc_parser.yacc" 1593 1597 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opScalarField,"minus") ; (yyval.node)->addChild((yyvsp[(1) - (3)].node)) ; (yyval.node)->addChild((yyvsp[(3) - (3)].node)); ;} 1594 1598 break; … … 1597 1601 1598 1602 /* Line 1455 of yacc.c */ 1599 #line 8 5"yacc_parser.yacc"1603 #line 89 "yacc_parser.yacc" 1600 1604 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opFieldScalar,"mult") ; (yyval.node)->addChild((yyvsp[(1) - (3)].node)) ; (yyval.node)->addChild((yyvsp[(3) - (3)].node)); ;} 1601 1605 break; … … 1604 1608 1605 1609 /* Line 1455 of yacc.c */ 1606 #line 86"yacc_parser.yacc"1610 #line 90 "yacc_parser.yacc" 1607 1611 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opScalarField,"mult") ; (yyval.node)->addChild((yyvsp[(1) - (3)].node)) ; (yyval.node)->addChild((yyvsp[(3) - (3)].node)); ;} 1608 1612 break; … … 1611 1615 1612 1616 /* Line 1455 of yacc.c */ 1613 #line 87"yacc_parser.yacc"1617 #line 91 "yacc_parser.yacc" 1614 1618 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opFieldScalar,"div") ; (yyval.node)->addChild((yyvsp[(1) - (3)].node)) ; (yyval.node)->addChild((yyvsp[(3) - (3)].node)); ;} 1615 1619 break; … … 1618 1622 1619 1623 /* Line 1455 of yacc.c */ 1620 #line 88"yacc_parser.yacc"1624 #line 92 "yacc_parser.yacc" 1621 1625 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opScalarField,"div") ; (yyval.node)->addChild((yyvsp[(1) - (3)].node)) ; (yyval.node)->addChild((yyvsp[(3) - (3)].node)); ;} 1622 1626 break; … … 1625 1629 1626 1630 /* Line 1455 of yacc.c */ 1627 #line 89"yacc_parser.yacc"1631 #line 93 "yacc_parser.yacc" 1628 1632 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opFieldScalar,"pow") ; (yyval.node)->addChild((yyvsp[(1) - (3)].node)) ; (yyval.node)->addChild((yyvsp[(3) - (3)].node)); ;} 1629 1633 break; … … 1632 1636 1633 1637 /* Line 1455 of yacc.c */ 1634 #line 9 0"yacc_parser.yacc"1638 #line 94 "yacc_parser.yacc" 1635 1639 { (yyval.node)=new CSimpleNodeExpr(CSimpleNodeExpr::opField,(yyvsp[(1) - (4)].str)) ; (yyval.node)->addChild((yyvsp[(3) - (4)].node)) ; delete (yyvsp[(1) - (4)].str);} 1636 1640 break; … … 1639 1643 1640 1644 /* Line 1455 of yacc.c */ 1641 #line 164 0"yacc_parser.cpp"1645 #line 1644 "yacc_parser.cpp" 1642 1646 default: break; 1643 1647 } … … 1851 1855 1852 1856 /* Line 1675 of yacc.c */ 1853 #line 9 2"yacc_parser.yacc"1857 #line 96 "yacc_parser.yacc" 1854 1858 1855 1859 … … 1858 1862 int yyerror(const char *s) 1859 1863 { 1860 cout<<"Parsing error :"<<s<<endl;1864 ERROR("int yyerror(const char *s)", <<"Parsing error :"<<s<<endl) ; 1861 1865 } 1862 1866 } … … 1866 1870 CSimpleNodeExpr* parseExpr(const string& strExpr) 1867 1871 { 1868 cout<<strExpr<<endl ;1869 1872 globalInputText=strExpr ; 1870 1873 globalReadOffset=0 ; -
XIOS/trunk/src/parse_expr/yacc_parser.hpp
r458 r493 63 63 64 64 /* Line 1676 of yacc.c */ 65 #line 3 2"yacc_parser.yacc"65 #line 36 "yacc_parser.yacc" 66 66 67 67 std::string* str ; /* symbol table index */ -
XIOS/trunk/src/parse_expr/yacc_parser.yacc
r458 r493 3 3 #include <string> 4 4 #include <iostream> 5 #include "exception.hpp" 6 5 7 using namespace std ; 8 using namespace xios ; 9 6 10 extern "C" 7 11 { … … 52 56 53 57 Line: 54 END { cout<<"The end: \n";}55 | Field_expr END { cout<<"Parsed END..."<<endl ;parsed=$1 ;}58 END { } 59 | Field_expr END { parsed=$1 ;} 56 60 ; 57 61 … … 96 100 int yyerror(const char *s) 97 101 { 98 cout<<"Parsing error :"<<s<<endl;102 ERROR("int yyerror(const char *s)", <<"Parsing error :"<<s<<endl) ; 99 103 } 100 104 } … … 104 108 CSimpleNodeExpr* parseExpr(const string& strExpr) 105 109 { 106 cout<<strExpr<<endl ;107 110 globalInputText=strExpr ; 108 111 globalReadOffset=0 ; -
XIOS/trunk/src/server.cpp
r492 r493 91 91 MPI_Comm_size(intraComm,&intraCommSize) ; 92 92 MPI_Comm_rank(intraComm,&intraCommRank) ; 93 cout<<"intercommCreate::server "<<rank<<" intraCommSize : "<<intraCommSize94 <<" intraCommRank :"<<intraCommRank<<" clientLeader "<< clientLeader<<endl ;93 info(50)<<"intercommCreate::server "<<rank<<" intraCommSize : "<<intraCommSize 94 <<" intraCommRank :"<<intraCommRank<<" clientLeader "<< clientLeader<<endl ; 95 95 96 96 MPI_Intercomm_create(intraComm,0,CXios::globalComm,clientLeader,0,&newComm) ;
Note: See TracChangeset
for help on using the changeset viewer.