- Timestamp:
- 07/23/18 16:32:19 (6 years ago)
- Location:
- XIOS
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/branchs/xios-2.5/src/node/domain.cpp
r1509 r1565 458 458 void CDomain::fillInRectilinearLonLat() 459 459 { 460 if (!lonvalue_rectilinear_read_from_file.isEmpty() )460 if (!lonvalue_rectilinear_read_from_file.isEmpty() && lonvalue_2d.isEmpty() && lonvalue_1d.isEmpty()) 461 461 { 462 462 lonvalue_1d.resize(ni); … … 492 492 493 493 494 if (!latvalue_rectilinear_read_from_file.isEmpty() )494 if (!latvalue_rectilinear_read_from_file.isEmpty() && latvalue_2d.isEmpty() && latvalue_1d.isEmpty()) 495 495 { 496 496 latvalue_1d.resize(nj); … … 532 532 void CDomain::fillInCurvilinearLonLat() 533 533 { 534 if (!lonvalue_curvilinear_read_from_file.isEmpty() && lonvalue_2d.isEmpty() )534 if (!lonvalue_curvilinear_read_from_file.isEmpty() && lonvalue_2d.isEmpty() && lonvalue_1d.isEmpty()) 535 535 { 536 536 lonvalue_2d.resize(ni,nj); … … 542 542 } 543 543 544 if (!latvalue_curvilinear_read_from_file.isEmpty() && latvalue_2d.isEmpty() )544 if (!latvalue_curvilinear_read_from_file.isEmpty() && latvalue_2d.isEmpty() && latvalue_1d.isEmpty()) 545 545 { 546 546 latvalue_2d.resize(ni,nj); … … 552 552 } 553 553 554 if (!bounds_lonvalue_curvilinear_read_from_file.isEmpty() && bounds_lon_2d.isEmpty() )554 if (!bounds_lonvalue_curvilinear_read_from_file.isEmpty() && bounds_lon_2d.isEmpty() && bounds_lon_1d.isEmpty()) 555 555 { 556 556 bounds_lon_2d.resize(nvertex,ni,nj); … … 563 563 } 564 564 565 if (!bounds_latvalue_curvilinear_read_from_file.isEmpty() && bounds_lat_2d.isEmpty() )565 if (!bounds_latvalue_curvilinear_read_from_file.isEmpty() && bounds_lat_2d.isEmpty() && bounds_lat_1d.isEmpty()) 566 566 { 567 567 bounds_lat_2d.resize(nvertex,ni,nj); -
XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp
r1509 r1565 458 458 void CDomain::fillInRectilinearLonLat() 459 459 { 460 if (!lonvalue_rectilinear_read_from_file.isEmpty() )460 if (!lonvalue_rectilinear_read_from_file.isEmpty() && lonvalue_2d.isEmpty() && lonvalue_1d.isEmpty()) 461 461 { 462 462 lonvalue_1d.resize(ni); … … 492 492 493 493 494 if (!latvalue_rectilinear_read_from_file.isEmpty() )494 if (!latvalue_rectilinear_read_from_file.isEmpty() && latvalue_2d.isEmpty() && latvalue_1d.isEmpty()) 495 495 { 496 496 latvalue_1d.resize(nj); … … 532 532 void CDomain::fillInCurvilinearLonLat() 533 533 { 534 if (!lonvalue_curvilinear_read_from_file.isEmpty() && lonvalue_2d.isEmpty() )534 if (!lonvalue_curvilinear_read_from_file.isEmpty() && lonvalue_2d.isEmpty() && lonvalue_1d.isEmpty()) 535 535 { 536 536 lonvalue_2d.resize(ni,nj); … … 542 542 } 543 543 544 if (!latvalue_curvilinear_read_from_file.isEmpty() && latvalue_2d.isEmpty() )544 if (!latvalue_curvilinear_read_from_file.isEmpty() && latvalue_2d.isEmpty() && latvalue_1d.isEmpty()) 545 545 { 546 546 latvalue_2d.resize(ni,nj); … … 552 552 } 553 553 554 if (!bounds_lonvalue_curvilinear_read_from_file.isEmpty() && bounds_lon_2d.isEmpty() )554 if (!bounds_lonvalue_curvilinear_read_from_file.isEmpty() && bounds_lon_2d.isEmpty() && bounds_lon_1d.isEmpty()) 555 555 { 556 556 bounds_lon_2d.resize(nvertex,ni,nj); … … 563 563 } 564 564 565 if (!bounds_latvalue_curvilinear_read_from_file.isEmpty() && bounds_lat_2d.isEmpty() )565 if (!bounds_latvalue_curvilinear_read_from_file.isEmpty() && bounds_lat_2d.isEmpty() && bounds_lat_1d.isEmpty()) 566 566 { 567 567 bounds_lat_2d.resize(nvertex,ni,nj); -
XIOS/trunk/src/node/domain.cpp
r1553 r1565 458 458 void CDomain::fillInRectilinearLonLat() 459 459 { 460 if (!lonvalue_rectilinear_read_from_file.isEmpty() )460 if (!lonvalue_rectilinear_read_from_file.isEmpty() && lonvalue_2d.isEmpty() && lonvalue_1d.isEmpty()) 461 461 { 462 462 lonvalue_1d.resize(ni); … … 492 492 493 493 494 if (!latvalue_rectilinear_read_from_file.isEmpty() )494 if (!latvalue_rectilinear_read_from_file.isEmpty() && latvalue_2d.isEmpty() && latvalue_1d.isEmpty()) 495 495 { 496 496 latvalue_1d.resize(nj); … … 527 527 528 528 /* 529 Fill in longitude and latitude of curvilinear domain read from a file530 If there are already longitude and latitude defined by model. We just ig onore readingvalue.529 Fill in 2D longitude and latitude of curvilinear domain read from a file. 530 If there are already longitude and latitude defined by model. We just ignore read value. 531 531 */ 532 532 void CDomain::fillInCurvilinearLonLat() 533 533 { 534 if (!lonvalue_curvilinear_read_from_file.isEmpty() && lonvalue_2d.isEmpty() )534 if (!lonvalue_curvilinear_read_from_file.isEmpty() && lonvalue_2d.isEmpty() && lonvalue_1d.isEmpty()) 535 535 { 536 536 lonvalue_2d.resize(ni,nj); … … 542 542 } 543 543 544 if (!latvalue_curvilinear_read_from_file.isEmpty() && latvalue_2d.isEmpty() )544 if (!latvalue_curvilinear_read_from_file.isEmpty() && latvalue_2d.isEmpty() && latvalue_1d.isEmpty()) 545 545 { 546 546 latvalue_2d.resize(ni,nj); … … 552 552 } 553 553 554 if (!bounds_lonvalue_curvilinear_read_from_file.isEmpty() && bounds_lon_2d.isEmpty() )554 if (!bounds_lonvalue_curvilinear_read_from_file.isEmpty() && bounds_lon_2d.isEmpty() && bounds_lon_1d.isEmpty()) 555 555 { 556 556 bounds_lon_2d.resize(nvertex,ni,nj); … … 563 563 } 564 564 565 if (!bounds_latvalue_curvilinear_read_from_file.isEmpty() && bounds_lat_2d.isEmpty() )565 if (!bounds_latvalue_curvilinear_read_from_file.isEmpty() && bounds_lat_2d.isEmpty() && bounds_lat_1d.isEmpty()) 566 566 { 567 567 bounds_lat_2d.resize(nvertex,ni,nj); … … 2918 2918 dataJIndex(lInd) = (-1 == dataJIndex(lInd)) ? tmpJ(ind) : dataJIndex(lInd); 2919 2919 2920 if (!domainMask(lInd)) // Include mask info into data index on the RECEIVE getServerDimensionSizes 2920 if (!domainMask(lInd)) // Include mask info into data index on the RECEIVE getServerDimensionSizes 2921 2921 { 2922 2922 dataIIndex(lInd) = dataJIndex(lInd) = -1;
Note: See TracChangeset
for help on using the changeset viewer.