Changeset 1630 for XIOS/dev/dev_trunk_omp/src

Timestamp:

12/21/18 09:19:12 (5 years ago)

Author:

yushan

Message:

working branch @1608 with bug fix @1628

Location:

XIOS/dev/dev_trunk_omp/src

Files:

• calendar.cpp (modified) (5 diffs)
• calendar.hpp (modified) (4 diffs)
• calendar_util.cpp (modified) (1 diff)
• config/domain_attribute.conf (modified) (1 diff)
• config/interpolate_domain_attribute.conf (modified) (1 diff)
• context_client.cpp (modified) (3 diffs)
• date/allleap.cpp (modified) (2 diffs)
• date/allleap.hpp (modified) (1 diff)
• date/d360.cpp (modified) (1 diff)
• date/d360.hpp (modified) (1 diff)
• date/gregorian.cpp (modified) (1 diff)
• date/gregorian.hpp (modified) (1 diff)
• io/onetcdf4_impl.hpp (modified) (1 diff)
• node/interpolate_domain.cpp (modified) (1 diff)
• transformation/domain_algorithm_interpolate.cpp (modified) (5 diffs)
• transformation/domain_algorithm_zoom.cpp (modified) (1 diff)

XIOS/dev/dev_trunk_omp/src/calendar.cpp

@@ -119 +119 @@
         this->timestep = timestep;
       }
-/*
+
       int CCalendar::getStep(void) const
       {
         return step;
       }
-*/
+
       const CDate& CCalendar::update(int step)
       {
@@ -153 +153 @@
       //-----------------------------------------------------------------
 
-      //const CDuration& CCalendar::getTimeStep(void) const { return this->timestep; }
-      //const CDate& CCalendar::getInitDate(void) const     { return this->initDate; }
-      //const CDate& CCalendar::getTimeOrigin(void) const   { return this->timeOrigin; }
-      //const CDate& CCalendar::getCurrentDate(void) const  { return this->currentDate; }
+      const CDuration& CCalendar::getTimeStep(void) const { return this->timestep; }
+      const CDate& CCalendar::getInitDate(void) const     { return this->initDate; }
+      const CDate& CCalendar::getTimeOrigin(void) const   { return this->timeOrigin; }
+      const CDate& CCalendar::getCurrentDate(void) const  { return this->currentDate; }
 
       //-----------------------------------------------------------------
@@ -169 +169 @@
       StdString CCalendar::getType(void) const { return StdString(this->getId()); }
 
-      //int CCalendar::getYearTotalLength(const CDate& date) const { return (365 * 86400); }
+      int CCalendar::getYearTotalLength(const CDate& date) const { return (365 * 86400); }
 
       //int CCalendar::getYearLength  (void) const { return 12; }
@@ -177 +177 @@
       //int CCalendar::getDayLengthInSeconds(void) const { return getDayLength() * getHourLength() * getMinuteLength(); }
 
-      //bool CCalendar::hasLeapYear() const { return false; }
-
-      /*StdString CCalendar::getMonthName(int monthId) const
+      bool CCalendar::hasLeapYear() const { return false; }
+
+      StdString CCalendar::getMonthName(int monthId) const
       {
         static const StdString MonthNames[] =
@@ -185 +185 @@
             "july",    "august",   "september", "october", "november", "december" };
         return MonthNames[monthId - 1];
-      }*/
+      }
 
       const StdString CCalendar::getMonthShortName(int monthId) const

XIOS/dev/dev_trunk_omp/src/calendar.hpp

@@ -52 +52 @@
 
             /// Mutateur ///
-            void setTimeStep(const CDuration& timestep) ;
+            void setTimeStep(const CDuration& timestep);
             void setInitDate(const CDate& initDate);
             void setTimeOrigin(const CDate& timeOrigin);
@@ -60 +60 @@
 
             /// Accesseurs ///
-            const CDuration& getTimeStep(void) const { return this->timestep; };
-            const CDate& getInitDate(void) const { return this->initDate; };
-            const CDate& getTimeOrigin(void) const { return this->timeOrigin; };
-            const CDate& getCurrentDate(void) const { return this->currentDate; };
+            const CDuration& getTimeStep(void) const;
+            const CDate& getInitDate(void) const;
+            const CDate& getTimeOrigin(void) const;
+            const CDate& getCurrentDate(void) const;
 
          public :
@@ -70 +70 @@
             virtual StdString getType(void) const;
 
-            int getStep(void) const {return step;};
+            int getStep(void) const;
 
             inline int getMonthLength(const CDate& date) const
@@ -78 +78 @@
             };
 
-            //virtual int getYearTotalLength(const CDate& date) const; // Retourne la durée d'une année en seconde.
-            inline virtual int getYearTotalLength(const CDate& date) const { return (365 * 86400); } ; // Retourne la durée d'une année en seconde.
+            virtual int getYearTotalLength(const CDate& date) const; // Retourne la durée d'une année en seconde.
 
             //virtual int getYearLength  (void) const; // Retourne la durée d'une année en mois.
-            inline virtual int getYearLength (void) const { return 12; } ;
-            inline virtual int getDayLength   (void) const { return 24; } ; // Retourne la durée d'un jour en heures.
-            inline virtual int getHourLength  (void) const { return 60; } ; // Retourne la durée d'une heure en minute.
-            inline virtual int getMinuteLength(void) const {return 60; } ; // Retourne la durée d'une minute en secondes.
+            inline int getYearLength (void) const { return 12; } ;
+            inline int getDayLength   (void) const { return 24; } ; // Retourne la durée d'un jour en heures.
+            inline int getHourLength  (void) const { return 60; } ; // Retourne la durée d'une heure en minute.
+            inline int getMinuteLength(void) const {return 60; } ; // Retourne la durée d'une minute en secondes.
             /*! Returns the day length expressed in seconds. */
-            inline virtual int getDayLengthInSeconds(void) const { return 86400; } ;
+            inline int getDayLengthInSeconds(void) const { return 86400; } ;
 
-            inline virtual StdString getMonthName(int monthId) const
-            {
-              static const StdString MonthNames[] =
-                         { "january", "february", "march",     "april" ,  "may",      "june",
-                           "july",    "august",   "september", "october", "november", "december" };
-              return MonthNames[monthId - 1];
-            };
+            virtual StdString getMonthName(int monthId) const;
             virtual const StdString getMonthShortName(int monthId) const;
 
             /*! Test if the calendar can have leap year. */
-            inline virtual bool hasLeapYear() const {return false;};
+            virtual bool hasLeapYear() const;
 
             void initializeDate(int yr, int mth, int d, int hr = 0, int min = 0, int sec = 0);

XIOS/dev/dev_trunk_omp/src/calendar_util.cpp

@@ -1 +1 @@
 #include "calendar_util.hpp"
+#include "calendar.hpp"
 
 namespace xios

XIOS/dev/dev_trunk_omp/src/config/domain_attribute.conf

@@ -58 +58 @@
 
 DECLARE_ARRAY(double, 2, area)
-DECLARE_ATTRIBUTE(double, radius)
 
 DECLARE_ENUM4(type,rectilinear,curvilinear,unstructured, gaussian)

XIOS/dev/dev_trunk_omp/src/config/interpolate_domain_attribute.conf

@@ -10 +10 @@
 DECLARE_ATTRIBUTE(bool, write_weight)
 DECLARE_ENUM2(read_write_convention, c, fortran)
-DECLARE_ATTRIBUTE(bool, use_area)

XIOS/dev/dev_trunk_omp/src/context_client.cpp

@@ -96 +96 @@
     {
       list<int> ranks = event.getRanks();
-      info(100)<<"Event "<<timeLine<<" of context "<<context->getId()<<endl ;
+
       if (CXios::checkEventSync)
       {
@@ -124 +124 @@
         {
           event.send(timeLine, sizes, buffList);
-          info(100)<<"Event "<<timeLine<<" of context "<<context->getId()<<"  sent"<<endl ;
 
           checkBuffers(ranks);
@@ -143 +142 @@
           info(100)<<"DEBUG : temporaly event created : timeline "<<timeLine<<endl ;
           event.send(timeLine, tmpBufferedEvent.sizes, tmpBufferedEvent.buffers);
-          info(100)<<"Event "<<timeLine<<" of context "<<context->getId()<<"  sent"<<endl ;
         }
       }

XIOS/dev/dev_trunk_omp/src/date/allleap.cpp

@@ -32 +32 @@
 
       ///--------------------------------------------------------------
-/*
+
       int CAllLeapCalendar::getYearTotalLength(const CDate & date) const
       { return (366 * 86400); }
-*/
+
       int CAllLeapCalendar::getMonthLength(const CDate & date) const
       {
@@ -41 +41 @@
          return (CCalendar::getMonthLength(date));
       }
-/*
+
       StdString CAllLeapCalendar::getType(void) const
       { return (StdString("all_leap")); }
-*/
+
       ///--------------------------------------------------------------
 } // namespace xios

XIOS/dev/dev_trunk_omp/src/date/allleap.hpp

@@ -26 +26 @@
 
             /// Accesseurs ///
-            inline virtual int getYearTotalLength(const CDate & date) const { return (366 * 86400); };
+            virtual int getYearTotalLength(const CDate & date) const;
             virtual int getMonthLength(const CDate & date) const;
-            virtual StdString getType(void) const { return (StdString("all_leap")); };
+            virtual StdString getType(void) const;
 
             /// Destructeur ///
-            virtual ~CAllLeapCalendar(void) ;
+            virtual ~CAllLeapCalendar(void);
 
       }; // class CAllLeapCalendar

XIOS/dev/dev_trunk_omp/src/date/d360.cpp

@@ -33 +33 @@
       ///--------------------------------------------------------------
 
-      //int CD360Calendar::getYearTotalLength(const CDate & date) const
-      //{ return (360 * 86400); }
+      int CD360Calendar::getYearTotalLength(const CDate & date) const
+      { return (360 * 86400); }
 
-      //int CD360Calendar::getMonthLength(const CDate & date) const
-      //{ return (30); }
+      int CD360Calendar::getMonthLength(const CDate & date) const
+      { return (30); }
 
-      //StdString CD360Calendar::getType(void) const
-      //{ return (StdString("360_day")); }
+      StdString CD360Calendar::getType(void) const
+      { return (StdString("360_day")); }
 
       ///--------------------------------------------------------------

XIOS/dev/dev_trunk_omp/src/date/d360.hpp

@@ -26 +26 @@
 
             /// Accesseurs ///
-            inline virtual int getYearTotalLength(const CDate & date) const { return (360 * 86400); };
-            inline virtual int getMonthLength(const CDate & date) const { return 30; };
-            inline virtual StdString getType(void) const { return (StdString("360_day")); };
+            virtual int getYearTotalLength(const CDate & date) const;
+            virtual int getMonthLength(const CDate & date) const;
+            virtual StdString getType(void) const;
 
             /// Destructeur ///

XIOS/dev/dev_trunk_omp/src/date/gregorian.cpp

@@ -55 +55 @@
       }
 
-      //StdString CGregorianCalendar::getType(void) const
-      //{ return (StdString("gregorian")); }
+      StdString CGregorianCalendar::getType(void) const
+      { return (StdString("gregorian")); }
 
-      //bool CGregorianCalendar::hasLeapYear() const { return true; }
+      bool CGregorianCalendar::hasLeapYear() const { return true; }
 
       ///--------------------------------------------------------------

XIOS/dev/dev_trunk_omp/src/date/gregorian.hpp

@@ -28 +28 @@
             virtual int getYearTotalLength(const CDate & date) const;
             virtual int getMonthLength(const CDate & date) const;
-            inline virtual StdString getType(void) const { return (StdString("gregorian")); };
-            inline virtual int getYearLength (void) const { return 12; } ;
+            virtual StdString getType(void) const;
 
-            inline virtual bool hasLeapYear() const { return true; };
+            virtual bool hasLeapYear() const;
 
             /// Destructeur ///

XIOS/dev/dev_trunk_omp/src/io/onetcdf4_impl.hpp

@@ -73 +73 @@
     }
     char *PtrArrayStr ;
-    PtrArrayStr=new char[stringArrayLen*data.numElements()] ;
-    memset (PtrArrayStr,' ',stringArrayLen*data.numElements());
-    size_t offset=0 ;
+    PtrArrayStr=new char[stringArrayLen] ;
     Array<StdString,1>::const_iterator it, itb=data.begin(), ite=data.end() ;
-    for(it=itb;it!=ite;++it, offset+=stringArrayLen)
+    int lineNb = 0;
+    for(it=itb;it!=ite;++it)
     {
-      it->copy(PtrArrayStr+offset,it->size()) ;
-      PtrArrayStr[offset+it->size()]='\0' ;
+      it->copy(PtrArrayStr,it->size()) ;
+      PtrArrayStr[it->size()]='\0' ;
+      sstart[0] = lineNb;
+      sstart[dimArrayLen] = 0;
+      scount[0] = 1;
+      scount[dimArrayLen] = it->size() + 1;
+      CTimer::get("CONetCDF4::writeData writeData_").resume();
+      this->writeData_(grpid, varid, sstart, scount, PtrArrayStr);
+      CTimer::get("CONetCDF4::writeData writeData_").suspend();
+      ++lineNb;
     }
-
-     CTimer::get("CONetCDF4::writeData writeData_").resume();
-     this->writeData_(grpid, varid, sstart, scount, PtrArrayStr);
-     CTimer::get("CONetCDF4::writeData writeData_").suspend();
-
     delete []  PtrArrayStr;
   }

XIOS/dev/dev_trunk_omp/src/node/interpolate_domain.cpp

@@ -65 +65 @@
     if (this->read_write_convention.isEmpty()) this->read_write_convention.setValue(read_write_convention_attr::fortran);
 
-
   }
 

XIOS/dev/dev_trunk_omp/src/transformation/domain_algorithm_interpolate.cpp

@@ -305 +305 @@
   CArray<double,2> boundsLonSrcUnmasked(nVertexSrc,nSrcLocalUnmasked);
   CArray<double,2> boundsLatSrcUnmasked(nVertexSrc,nSrcLocalUnmasked);
-  CArray<double,1> areaSrcUnmasked(nSrcLocalUnmasked);
-  
   long int * globalSrcUnmasked = new long int [nSrcLocalUnmasked];
 
   nSrcLocalUnmasked=0 ;
-  bool hasSrcArea=domainSrc_->hasArea && !domainSrc_->radius.isEmpty() && !interpDomain_->use_area.isEmpty() && interpDomain_->use_area==true  ;
-  double srcAreaFactor ;
-  if (hasSrcArea) srcAreaFactor=1./(domainSrc_->radius*domainSrc_->radius) ;
-  
   for (int idx=0 ; idx < nSrcLocal; idx++)
   {
@@ -323 +317 @@
         boundsLatSrcUnmasked(n,nSrcLocalUnmasked) = boundsLatSrc(n,idx) ;
       }
-      if (hasSrcArea) areaSrcUnmasked(nSrcLocalUnmasked) = domainSrc_->areavalue(idx)*srcAreaFactor ;
       globalSrcUnmasked[nSrcLocalUnmasked]=globalSrc[idx] ;
       ++nSrcLocalUnmasked ;
     }
   }
- 
+
 
   int nDstLocalUnmasked = 0 ;
@@ -335 +328 @@
   CArray<double,2> boundsLonDestUnmasked(nVertexDest,nDstLocalUnmasked);
   CArray<double,2> boundsLatDestUnmasked(nVertexDest,nDstLocalUnmasked);
-  CArray<double,1>   areaDstUnmasked(nDstLocalUnmasked);
-
   long int * globalDstUnmasked = new long int [nDstLocalUnmasked];
 
   nDstLocalUnmasked=0 ;
-  bool hasDstArea=domainDest_->hasArea && !domainDest_->radius.isEmpty() && !interpDomain_->use_area.isEmpty() && interpDomain_->use_area==true ;
-  double dstAreaFactor ;
-  if (hasDstArea) dstAreaFactor=1./(domainDest_->radius*domainDest_->radius) ;
   for (int idx=0 ; idx < nDstLocal; idx++)
   {
@@ -352 +340 @@
         boundsLatDestUnmasked(n,nDstLocalUnmasked) = boundsLatDest(n,idx) ;
       }
-      if (hasDstArea) areaDstUnmasked(nDstLocalUnmasked) = domainDest_->areavalue(idx)*dstAreaFactor ;
       globalDstUnmasked[nDstLocalUnmasked]=globalDst[idx] ;
       ++nDstLocalUnmasked ;
@@ -358 +345 @@
   }
 
-  double* ptAreaSrcUnmasked = NULL ;
-  if (hasSrcArea) ptAreaSrcUnmasked=areaSrcUnmasked.dataFirst() ;
-
-  double* ptAreaDstUnmasked = NULL ;
-  if (hasDstArea) ptAreaDstUnmasked=areaDstUnmasked.dataFirst() ;
-
-  mapper.setSourceMesh(boundsLonSrcUnmasked.dataFirst(), boundsLatSrcUnmasked.dataFirst(), ptAreaSrcUnmasked, nVertexSrc, nSrcLocalUnmasked, &srcPole[0], globalSrcUnmasked);
-  mapper.setTargetMesh(boundsLonDestUnmasked.dataFirst(), boundsLatDestUnmasked.dataFirst(), ptAreaDstUnmasked, nVertexDest, nDstLocalUnmasked, &dstPole[0], globalDstUnmasked);
+  mapper.setSourceMesh(boundsLonSrcUnmasked.dataFirst(), boundsLatSrcUnmasked.dataFirst(), nVertexSrc, nSrcLocalUnmasked, &srcPole[0], globalSrcUnmasked);
+  mapper.setTargetMesh(boundsLonDestUnmasked.dataFirst(), boundsLatDestUnmasked.dataFirst(), nVertexDest, nDstLocalUnmasked, &dstPole[0], globalDstUnmasked);
 
   std::vector<double> timings = mapper.computeWeights(orderInterp,renormalize,quantity);

XIOS/dev/dev_trunk_omp/src/transformation/domain_algorithm_zoom.cpp

@@ -93 +93 @@
   domainDest_->ni.setValue(niDest);
   domainDest_->nj.setValue(njDest);
-  if ( (niDest==0) || (njDest==0))
-  {
-    domainDest_->ibegin.setValue(0);
-    domainDest_->jbegin.setValue(0);
-  }
-  else
-  {
-    domainDest_->ibegin.setValue(ibeginDest);
-    domainDest_->jbegin.setValue(jbeginDest);
-  }
+  domainDest_->ibegin.setValue(ibeginDest);
+  domainDest_->jbegin.setValue(jbeginDest);
   domainDest_->i_index.resize(niDest*njDest);
   domainDest_->j_index.resize(niDest*njDest);