Changeset 2613 for XIOS3/trunk/src/io/onetcdf4.cpp

Timestamp:

03/08/24 17:05:40 (3 months ago)

Author:

jderouillat

Message:

Fix the attached mode for scalar output, and some bugs revealed by the adastra porting in debug mode

File:

• XIOS3/trunk/src/io/onetcdf4.cpp (modified) (1 diff)

XIOS3/trunk/src/io/onetcdf4.cpp

@@ -478 +478 @@
                 normalizingWeight = userChunkingWeights[i];
               }
-
-            std::vector<double> chunkingRatioPerDims; // will store coefficients used to compute chunk size
-            double productRatios = 1; // last_coeff = pow( shrink_ratio / (product of all ratios), 1/countChunkingDims )
-            for (int i=0;i<userChunkingWeights.size();i++)
+            if (normalizingWeight!=0) // no chunk for scalar
             {
-              chunkingRatioPerDims.push_back( userChunkingWeights[i] / normalizingWeight );
-              if (chunkingRatioPerDims[i]) productRatios *= chunkingRatioPerDims[i];
-            }
-            for (int i=0;i<userChunkingWeights.size();i++)
-            {
-              chunkingRatioPerDims[i] *= pow( chunkingRatio / productRatios, 1./countChunkingDims );
-            }
-            
-            std::vector<double>::iterator itChunkingRatios = chunkingRatioPerDims.begin();
-            //itId = dim.rbegin();
-            double correctionFromPreviousDim = 1.;
-            for (vector<StdSize>::reverse_iterator itDim = dimsizes.rbegin(); itDim != dimsizes.rend(); ++itDim, ++itChunkingRatios, ++itId)
-            {
-              *itChunkingRatios *= correctionFromPreviousDim;
-              correctionFromPreviousDim = 1;
-              if (*itChunkingRatios > 1) // else target larger than size !
+              std::vector<double> chunkingRatioPerDims; // will store coefficients used to compute chunk size
+              double productRatios = 1; // last_coeff = pow( shrink_ratio / (product of all ratios), 1/countChunkingDims )
+              for (int i=0;i<userChunkingWeights.size();i++)
               {
-                StdSize dimensionSize = *itDim;
-                //info(0) << *itId << " " << *itDim << " " << *itChunkingRatios << " " << (*itDim)/(*itChunkingRatios) << endl;
-                *itDim = ceil( *itDim / ceil(*itChunkingRatios) );
-                correctionFromPreviousDim = *itChunkingRatios/ ((double)dimensionSize/(*itDim));
+                chunkingRatioPerDims.push_back( userChunkingWeights[i] / normalizingWeight );
+                if (chunkingRatioPerDims[i]) productRatios *= chunkingRatioPerDims[i];
               }
-            }
+              for (int i=0;i<userChunkingWeights.size();i++)
+              {
+                chunkingRatioPerDims[i] *= pow( chunkingRatio / productRatios, 1./countChunkingDims );
+              }
+              
+              std::vector<double>::iterator itChunkingRatios = chunkingRatioPerDims.begin();
+              //itId = dim.rbegin();
+              double correctionFromPreviousDim = 1.;
+              for (vector<StdSize>::reverse_iterator itDim = dimsizes.rbegin(); itDim != dimsizes.rend(); ++itDim, ++itChunkingRatios, ++itId)
+              {
+                *itChunkingRatios *= correctionFromPreviousDim;
+                correctionFromPreviousDim = 1;
+                if (*itChunkingRatios > 1) // else target larger than size !
+                {
+                  StdSize dimensionSize = *itDim;
+                  //info(0) << *itId << " " << *itDim << " " << *itChunkingRatios << " " << (*itDim)/(*itChunkingRatios) << endl;
+                  *itDim = ceil( *itDim / ceil(*itChunkingRatios) );
+                  correctionFromPreviousDim = *itChunkingRatios/ ((double)dimensionSize/(*itDim));
+                }
+              }
+            }
             int storageType = (0 == dimSize) ? NC_CONTIGUOUS : NC_CHUNKED;
             CNetCdfInterface::defVarChunking(grpid, varid, storageType, &dimsizes[0]);