Changeset 1156 for XIOS/dev/branch_yushan_merged/src/io/nc4_data_output.cpp
- Timestamp:
- 06/06/17 15:52:13 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/branch_yushan_merged/src/io/nc4_data_output.cpp
r1138 r1156 11 11 #include "netCdfException.hpp" 12 12 #include "exception.hpp" 13 #include "timer.hpp" 13 14 #include "uuid.hpp" 14 15 // mpi.hpp … … 1833 1834 singleDomain = (file->nbDomains == 1); 1834 1835 1836 StdString conv_str ; 1837 if (file->convention_str.isEmpty()) 1838 { 1839 if (SuperClassWriter::useCFConvention) conv_str="CF-1.6" ; 1840 else conv_str="UGRID" ; 1841 } 1842 else conv_str=file->convention_str ; 1843 1835 1844 try 1836 1845 { 1837 if (SuperClassWriter::useCFConvention) 1838 this->writeFileAttributes(filename, description, 1839 StdString("CF-1.6"), 1840 StdString("An IPSL model"), 1841 this->getTimeStamp()); 1842 else 1843 this->writeFileAttributes(filename, description, 1844 StdString("UGRID"), 1845 StdString("An IPSL model"), 1846 this->getTimeStamp()); 1847 1846 this->writeFileAttributes(filename, description, 1847 conv_str, 1848 StdString("An IPSL model"), 1849 this->getTimeStamp()); 1848 1850 1849 1851 if (!appendMode) … … 1990 1992 CGrid* grid = field->grid; 1991 1993 1992 if (field->getNStep()<1) return ; 1994 if (field->getNStep()<1) 1995 { 1996 return; 1997 } 1993 1998 1994 1999 if (!grid->doGridHaveDataToWrite()) 1995 if (SuperClass::type == MULTI_FILE || !isCollective) return; 1996 2000 if (SuperClass::type == MULTI_FILE || !isCollective) 2001 { 2002 return; 2003 } 2004 2005 1997 2006 StdString fieldid = field->getFieldOutputName(); 1998 2007 … … 2119 2128 case (MULTI_FILE) : 2120 2129 { 2130 CTimer::get("Files : writing data").resume(); 2121 2131 SuperClassWriter::writeData(fieldData, fieldid, isCollective, field->getNStep() - 1); 2132 CTimer::get("Files : writing data").suspend(); 2122 2133 if (wtime) 2123 2134 { 2135 CTimer::get("Files : writing time axis").resume(); 2124 2136 if ( wtimeData) 2125 2137 { 2126 SuperClassWriter::writeData(time_data, timeAxisId, isCollective, field->getNStep() - 1); 2127 SuperClassWriter::writeData(time_data_bound, timeAxisBoundId, isCollective, field->getNStep() - 1); 2128 } 2138 // SuperClassWriter::writeData(time_data, timeAxisId, isCollective, field->getNStep() - 1); 2139 // SuperClassWriter::writeData(time_data_bound, timeAxisBoundId, isCollective, field->getNStep() - 1); 2140 SuperClassWriter::writeTimeAxisData(time_data, timeAxisId, isCollective, field->getNStep() - 1, isRoot); 2141 SuperClassWriter::writeTimeAxisDataBounds(time_data_bound, timeAxisBoundId, isCollective, field->getNStep() - 1, isRoot); 2142 } 2129 2143 if (wtimeCounter) 2130 2144 { 2131 SuperClassWriter::writeData(time_counter, getTimeCounterName(), isCollective, field->getNStep() - 1); 2132 if (timeCounterType!=record) SuperClassWriter::writeData(time_counter_bound, timeBoundId, isCollective, field->getNStep() - 1); 2145 // SuperClassWriter::writeData(time_counter, getTimeCounterName(), isCollective, field->getNStep() - 1); 2146 // if (timeCounterType!=record) SuperClassWriter::writeData(time_counter_bound, timeBoundId, isCollective, field->getNStep() - 1); 2147 SuperClassWriter::writeTimeAxisData(time_counter, getTimeCounterName(), isCollective, field->getNStep() - 1,isRoot); 2148 if (timeCounterType!=record) SuperClassWriter::writeTimeAxisDataBounds(time_counter_bound, timeBoundId, isCollective, field->getNStep() - 1, isRoot); 2133 2149 } 2150 CTimer::get("Files : writing time axis").suspend(); 2134 2151 } 2135 2152 break; … … 2257 2274 } 2258 2275 2276 2277 CTimer::get("Files : writing data").resume(); 2259 2278 SuperClassWriter::writeData(fieldData, fieldid, isCollective, field->getNStep() - 1, &start, &count); 2279 CTimer::get("Files : writing data").suspend(); 2280 2260 2281 if (wtime) 2261 2282 { 2283 CTimer::get("Files : writing time axis").resume(); 2262 2284 if ( wtimeData) 2263 2285 { 2264 SuperClassWriter::writeData(time_data, timeAxisId, isCollective, field->getNStep() - 1); 2265 SuperClassWriter::writeData(time_data_bound, timeAxisBoundId, isCollective, field->getNStep() - 1); 2286 // SuperClassWriter::writeData(time_data, timeAxisId, isCollective, field->getNStep() - 1); 2287 // SuperClassWriter::writeData(time_data_bound, timeAxisBoundId, isCollective, field->getNStep() - 1); 2288 SuperClassWriter::writeTimeAxisData(time_data, timeAxisId, isCollective, field->getNStep() - 1, isRoot); 2289 SuperClassWriter::writeTimeAxisDataBounds(time_data_bound, timeAxisBoundId, isCollective, field->getNStep() - 1, isRoot); 2266 2290 } 2267 2291 if (wtimeCounter) 2268 2292 { 2269 SuperClassWriter::writeData(time_counter, getTimeCounterName(), isCollective, field->getNStep() - 1); 2270 if (timeCounterType!=record) SuperClassWriter::writeData(time_counter_bound, timeBoundId, isCollective, field->getNStep() - 1); 2293 // SuperClassWriter::writeData(time_counter, getTimeCounterName(), isCollective, field->getNStep() - 1); 2294 // if (timeCounterType!=record) SuperClassWriter::writeData(time_counter_bound, timeBoundId, isCollective, field->getNStep() - 1); 2295 SuperClassWriter::writeTimeAxisData(time_counter, getTimeCounterName(), isCollective, field->getNStep() - 1,isRoot); 2296 if (timeCounterType!=record) SuperClassWriter::writeTimeAxisDataBounds(time_counter_bound, timeBoundId, isCollective, field->getNStep() - 1, isRoot); 2297 2271 2298 } 2299 CTimer::get("Files : writing time axis").suspend(); 2272 2300 } 2273 2301
Note: See TracChangeset
for help on using the changeset viewer.