Changeset 775 for XIOS/trunk/src/node/generate_rectilinear_domain.cpp

Timestamp:

11/02/15 11:46:25 (9 years ago)

Author:

mhnguyen

Message:

Implementing the reading of attributes of an axis from a file

+) 3d grid can be read directly from a file
+) Clean some redundant codes
+) Add new attribute declaration that allows to output only desired attributes

Test
+) On Curie
+) test_remap passes and result is correct

File:

• XIOS/trunk/src/node/generate_rectilinear_domain.cpp (modified) (4 diffs)

XIOS/trunk/src/node/generate_rectilinear_domain.cpp

@@ -89 +89 @@
       double boundsLonRange = bounds_lon_end - bounds_lon_start;
       double boundsLonStep = boundsLonRange/(double(niGlo));
-      domainDst->bounds_lon_start = bounds_lon_start;
-      domainDst->bounds_lon_end   = bounds_lon_end;
-      domainDst->lon_start = bounds_lon_start + boundsLonStep/2;
-      domainDst->lon_end   = bounds_lon_end   - boundsLonStep/2;
+      domainDst->bounds_lon_start.setValue(bounds_lon_start);
+      domainDst->bounds_lon_end.setValue(bounds_lon_end);
+      domainDst->lon_start.setValue(bounds_lon_start + boundsLonStep/2);
+      domainDst->lon_end.setValue( bounds_lon_end   - boundsLonStep/2);
     }
 
@@ -101 +101 @@
       double boundsLatRange = bounds_lat_end - bounds_lat_start;
       double boundsLatStep = boundsLatRange/(double(njGlo));
-      domainDst->bounds_lat_start = bounds_lat_start;
-      domainDst->bounds_lat_end   = bounds_lat_end;
-      domainDst->lat_start = bounds_lat_start + boundsLatStep/2;
-      domainDst->lat_end   = bounds_lat_end   - boundsLatStep/2;
+      domainDst->bounds_lat_start.setValue(bounds_lat_start);
+      domainDst->bounds_lat_end.setValue(bounds_lat_end);
+      domainDst->lat_start.setValue(bounds_lat_start + boundsLatStep/2);
+      domainDst->lat_end.setValue(bounds_lat_end   - boundsLatStep/2);
     }
 
@@ -115 +115 @@
       double lonRange = lon_end - lon_start;
       double lonStep = (1 == niGlo) ? lonRange : lonRange/(double(niGlo)-1);
-      domainDst->lon_start = lon_start;
-      domainDst->lon_end   = lon_end;
-      domainDst->bounds_lon_start = lon_start - lonStep/2;
-      domainDst->bounds_lon_end   = lon_end   + lonStep/2;
+      domainDst->lon_start.setValue(lon_start);
+      domainDst->lon_end.setValue(lon_end);
+      domainDst->bounds_lon_start.setValue(lon_start - lonStep/2);
+      domainDst->bounds_lon_end.setValue(lon_end   + lonStep/2);
     }
 
@@ -127 +127 @@
       double latRange = lat_end - lat_start;
       double latStep = (1 == njGlo) ? latRange : latRange/(double(njGlo)-1);
-      domainDst->lat_start = lat_start;
-      domainDst->lat_end   = lat_end;
-      domainDst->bounds_lat_start = lat_start - latStep/2;
-      domainDst->bounds_lat_end   = lat_end   + latStep/2;
+      domainDst->lat_start.setValue(lat_start);
+      domainDst->lat_end.setValue(lat_end);
+      domainDst->bounds_lat_start.setValue(lat_start - latStep/2);
+      domainDst->bounds_lat_end.setValue(lat_end   + latStep/2);
     }
   }