Changeset 464 for XIOS/trunk/src/output/nc4_data_output.cpp

Timestamp:

01/21/14 15:28:59 (10 years ago)

Author:

ymipsl

Message:

Enhancement : Add scale_factor and add_offset attribute to field output
Operation (field-add_offset)/scale_factor would be computed before output write.
If field attribute prec=2 the field would be rounded to nearest integer value and output as short int (2 bytes).

YM

File:

• XIOS/trunk/src/output/nc4_data_output.cpp (modified) (5 diffs)

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -566 +566 @@
 //          bool isCurvilinear = domain->isCurvilinear ; 
           
-         nc_type type = (!field->prec.isEmpty() &&
-                        ( field->prec.getValue() == 4))
-                        ? NC_FLOAT : NC_DOUBLE;
+         nc_type type ;
+         if (field->prec.isEmpty()) type =  NC_FLOAT ;
+         else
+         {
+           if (field->prec==2) type = NC_SHORT ;
+           else if (field->prec==4)  type =  NC_FLOAT ;
+           else if (field->prec==8)   type =  NC_DOUBLE ; 
+         }
+                     
          bool wtime   = !(!field->operation.isEmpty() && field->foperation->timeType() == func::CFunctor::once);
                          
@@ -628 +634 @@
             SuperClassWriter::addAttribute
                ("valid_max", field->valid_max.getValue(), &fieldid);
+
+          if (!field->scale_factor.isEmpty())
+            SuperClassWriter::addAttribute
+               ("scale_factor", field->scale_factor.getValue(), &fieldid);
+
+           if (!field->add_offset.isEmpty())
+            SuperClassWriter::addAttribute
+               ("add_offset", field->add_offset.getValue(), &fieldid);
                                             
          SuperClassWriter::addAttribute
@@ -765 +779 @@
          if (server->intraCommRank==0) isRoot=true ;
          else isRoot=false ;
-           
+          
+         if (!field->scale_factor.isEmpty() || !field->add_offset.isEmpty())
+         {
+           double scaleFactor=1. ;
+           double addOffset=0. ;
+           if (!field->scale_factor.isEmpty()) scaleFactor=field->scale_factor ;
+           if (!field->add_offset.isEmpty()) addOffset=field->add_offset ;
+           field->scaleFactorAddOffset(scaleFactor,addOffset) ;
+         }
+            
          if (grid->hasAxis()) // 3D
          {
@@ -771 +794 @@
             CArray<double,3> field_data3D(domain->zoom_ni_srv,domain->zoom_nj_srv,axis->zoom_size) ;
             if (!field->default_value.isEmpty()) field_data3D = field->default_value ;
+
             field->outputField(field_data3D);
+
+            if (field->prec==2) field_data3D=round(field_data3D) ;
+
             switch (SuperClass::type)
            {
@@ -815 +842 @@
             if (!field->default_value.isEmpty()) field_data2D = field->default_value ;
             field->outputField(field_data2D);
+            if (field->prec==2) field_data2D=round(field_data2D) ;
             switch (SuperClass::type)
             {