Changeset 628 for XIOS/branchs/xios-1.0

Timestamp:

06/24/15 14:51:09 (9 years ago)

Author:

rlacroix

Message:

Fix: Do not use a hardcoded value for the "DOMAIN_dimensions_ids" attribute.

After the CF-compliance changes, the hardcoded value was sometimes wrong.

Location:

XIOS/branchs/xios-1.0/src/output

Files:

• nc4_data_output.cpp (modified) (4 diffs)
• nc4_data_output.hpp (modified) (1 diff)

XIOS/branchs/xios-1.0/src/output/nc4_data_output.cpp

@@ -154 +154 @@
                                               appendDomid);
 
-                   if (singleDomain) this->writeLocalAttributes_IOIPSL(domain->zoom_ibegin_srv,
-                                                 domain->zoom_ni_srv,
-                                                 domain->zoom_jbegin_srv,
-                                                 domain->zoom_nj_srv,
-                                                 domain->ni_glo,domain->nj_glo,
-                                                 server->intraCommRank,server->intraCommSize);
+                   if (singleDomain)
+                    this->writeLocalAttributes_IOIPSL(dimXid, dimYid,
+                                                      domain->zoom_ibegin_srv,
+                                                      domain->zoom_ni_srv,
+                                                      domain->zoom_jbegin_srv,
+                                                      domain->zoom_nj_srv,
+                                                      domain->ni_glo,domain->nj_glo,
+                                                      server->intraCommRank,server->intraCommSize);
                  }
 
@@ -1430 +1432 @@
       }
 
-     void CNc4DataOutput::writeLocalAttributes_IOIPSL
-         (int ibegin, int ni, int jbegin, int nj, int ni_glo, int nj_glo, int rank, int size)
+      void CNc4DataOutput::writeLocalAttributes_IOIPSL(const StdString& dimXid, const StdString& dimYid,
+                                                       int ibegin, int ni, int jbegin, int nj, int ni_glo, int nj_glo, int rank, int size)
       {
          CArray<int,1> array(2) ;
@@ -1439 +1441 @@
            SuperClassWriter::addAttribute("DOMAIN_number_total",size ) ;
            SuperClassWriter::addAttribute("DOMAIN_number", rank) ;
-           array=1,2 ;
+           array=SuperClassWriter::getDimension(dimXid),SuperClassWriter::getDimension(dimYid);
            SuperClassWriter::addAttribute("DOMAIN_dimensions_ids",array) ;
            array=ni_glo,nj_glo ;
@@ -1462 +1464 @@
          catch (CNetCdfException& e)
          {
-           StdString msg("On writing Local Attributes IOI PSL \n");
+           StdString msg("On writing Local Attributes IOIPSL \n");
            msg.append("In the context : ");
            CContext* context = CContext::getCurrent() ;

XIOS/branchs/xios-1.0/src/output/nc4_data_output.hpp

@@ -56 +56 @@
             void writeUnstructuredDomain (CDomain* domain);
             void writeLocalAttributes(int ibegin, int ni, int jbegin, int nj, StdString domid);
-            void writeLocalAttributes_IOIPSL(int ibegin, int ni, int jbegin, int nj, int ni_glo, int nj_glo, int rank, int size) ;
+            void writeLocalAttributes_IOIPSL(const StdString& dimXid, const StdString& dimYid,
+                                             int ibegin, int ni, int jbegin, int nj, int ni_glo, int nj_glo, int rank, int size);
             void writeTimeAxisAttributes(const StdString & axis_name,
                                          const StdString & calendar,