Changeset 1628 for XIOS/dev/dev_trunk_omp/src

Timestamp:

12/18/18 17:34:59 (5 years ago)

Author:

yushan

Message:

bug fix (Nb of files less than Nb of servers)

Location:

XIOS/dev/dev_trunk_omp/src

Files:

• calendar.cpp (modified) (3 diffs)
• calendar.hpp (modified) (1 diff)
• calendar_util.cpp (modified) (1 diff)
• client.cpp (modified) (1 diff)
• date.cpp (modified) (1 diff)
• date.hpp (modified) (1 diff)
• node/context.cpp (modified) (1 diff)
• object_factory.hpp (modified) (1 diff)
• object_factory_decl_macro.hpp (modified) (1 diff)
• object_factory_impl.hpp (modified) (1 diff)
• object_template_impl.hpp (modified) (1 diff)
• test/test_omp.f90 (modified) (1 diff)

XIOS/dev/dev_trunk_omp/src/calendar.cpp

@@ -127 +127 @@
       const CDate& CCalendar::update(int step)
       {
-        #pragma omp critical (_output)
-        info(80) << "update step : " << step << " timestep " << this->timestep << std::endl;
+        //#pragma omp critical (_output)
+        //info(120) << "update step : " << step << " timestep " << this->timestep << std::endl;
         this->step = step;
         return (this->currentDate = this->getInitDate() + step * this->timestep);
@@ -160 +160 @@
       //-----------------------------------------------------------------
 
-      int CCalendar::getMonthLength(const CDate& date) const
+      /*int CCalendar::getMonthLength(const CDate& date) const
       { // Retourne la durée du mois en jour.
         static const int NoLeapMonthLength[] =
           { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
         return NoLeapMonthLength[date.getMonth() - 1];
-      }
+      }*/
 
       StdString CCalendar::getType(void) const { return StdString(this->getId()); }
@@ -171 +171 @@
       int CCalendar::getYearTotalLength(const CDate& date) const { return (365 * 86400); }
 
-      int CCalendar::getYearLength  (void) const { return 12; }
-      int CCalendar::getDayLength   (void) const { return 24; }
-      int CCalendar::getHourLength  (void) const { return 60; }
-      int CCalendar::getMinuteLength(void) const { return 60; }
-      int CCalendar::getDayLengthInSeconds(void) const { return getDayLength() * getHourLength() * getMinuteLength(); }
+      //int CCalendar::getYearLength  (void) const { return 12; }
+      //int CCalendar::getDayLength   (void) const { return 24; }
+      //int CCalendar::getHourLength  (void) const { return 60; }
+      //int CCalendar::getMinuteLength(void) const { return 60; }
+      //int CCalendar::getDayLengthInSeconds(void) const { return getDayLength() * getHourLength() * getMinuteLength(); }
 
       bool CCalendar::hasLeapYear() const { return false; }

XIOS/dev/dev_trunk_omp/src/calendar.hpp

@@ -72 +72 @@
             int getStep(void) const;
 
-            virtual int getMonthLength(const CDate& date) const;
+            inline int getMonthLength(const CDate& date) const
+            {
+              static const int NoLeapMonthLength[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+              return NoLeapMonthLength[date.getMonth() - 1];
+            };
 
             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.
-            virtual int getDayLength   (void) const; // Retourne la durée d'un jour en heures.
-            virtual int getHourLength  (void) const; // Retourne la durée d'une heure en minute.
-            virtual int getMinuteLength(void) const; // Retourne la durée d'une minute en secondes.
+            //virtual int getYearLength  (void) const; // Retourne la durée d'une année en mois.
+            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. */
-            virtual int getDayLengthInSeconds(void) const;
+            inline int getDayLengthInSeconds(void) const { return 86400; } ;
 
             virtual StdString getMonthName(int monthId) const;

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/client.cpp

@@ -315 +315 @@
         report(0)<< " Memory report : Minimum buffer size required : " << CClientBuffer::maxRequestSize << " bytes" << endl ;
         report(0)<< " Memory report : increasing it by a factor will increase performance, depending of the volume of data wrote in file at each time step of the file"<<endl ;
-        report(100)<<CTimer::getAllCumulatedTime()<<endl ;
+        report(0)<<CTimer::getAllCumulatedTime()<<endl ;
       }
    }

XIOS/dev/dev_trunk_omp/src/date.cpp

@@ -134 +134 @@
       //----------------------------------------------------------------
 
-      int CDate::getYear  (void) const { return (this->year  ); }
-      int CDate::getMonth (void) const { return (this->month ); }
-      int CDate::getDay   (void) const { return (this->day   ); }
-      int CDate::getHour  (void) const { return (this->hour  ); }
-      int CDate::getMinute(void) const { return (this->minute); }
-      int CDate::getSecond(void) const { return (this->second); }
+      //int CDate::getYear  (void) const { return (this->year  ); }
+      //int CDate::getMonth (void) const { return (this->month ); }
+      //int CDate::getDay   (void) const { return (this->day   ); }
+      //int CDate::getHour  (void) const { return (this->hour  ); }
+      //int CDate::getMinute(void) const { return (this->minute); }
+      //int CDate::getSecond(void) const { return (this->second); }
 
       //----------------------------------------------------------------

XIOS/dev/dev_trunk_omp/src/date.hpp

@@ -43 +43 @@
 
             /// Divers accesseurs ///
-            int getYear  (void) const;
-            int getMonth (void) const;
-            int getDay   (void) const;
-            int getHour  (void) const;
-            int getMinute(void) const;
-            int getSecond(void) const;
+            inline int getYear  (void) const {return year;};
+            inline int getMonth (void) const {return month;};
+            inline int getDay   (void) const {return day;};
+            inline int getHour  (void) const {return hour;};
+            inline int getMinute(void) const {return minute;};
+            inline int getSecond(void) const {return second;};
 
             //!< Get the calendar associated to the date

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

@@ -1847 +1847 @@
         }
 
-        #pragma omp critical (_output)
-        info(50) << "updateCalendar : before : " << calendar->getCurrentDate() << endl;
+        //#pragma omp critical (_output)
+        info(150) << "updateCalendar : before : " << calendar->getCurrentDate() << endl;
         calendar->update(step);
-        #pragma omp critical (_output)
-        info(50) << "updateCalendar : after : " << calendar->getCurrentDate() << endl;
+        //#pragma omp critical (_output)
+        info(150) << "updateCalendar : after : " << calendar->getCurrentDate() << endl;
   #ifdef XIOS_MEMTRACK_LIGHT
         #pragma omp critical (_output)

XIOS/dev/dev_trunk_omp/src/object_factory.hpp

@@ -37 +37 @@
 
          template <typename U>
+            static  int CheckObjectVector();
+               
+         template <typename U>
             static  const std::vector<std::shared_ptr<U> > &
                GetObjectVector(const StdString & context = CObjectFactory::GetCurrentContextId());

XIOS/dev/dev_trunk_omp/src/object_factory_decl_macro.hpp

@@ -10 +10 @@
   template int CObjectFactory::GetObjectIdNum<U>(void); \
   template const std::vector<std::shared_ptr<U> >& CObjectFactory::GetObjectVector<U>(const StdString& context ); \
+  template int CObjectFactory::CheckObjectVector<U>( ); \
   template bool CObjectFactory::HasObject<U>(const StdString& id); \
   template bool CObjectFactory::HasObject<U>(const StdString& context,const StdString& id); \

XIOS/dev/dev_trunk_omp/src/object_factory_impl.hpp

@@ -125 +125 @@
 
    template <typename U>
-      const std::vector<std::shared_ptr<U> > &
+   int CObjectFactory::CheckObjectVector()
+   {
+      if(U::AllVectObj_ptr)
+      {
+        return 1;
+      }
+      return 0;
+   }
+   
+
+   template <typename U>
+   const std::vector<std::shared_ptr<U> > &
          CObjectFactory::GetObjectVector(const StdString & context)
    {
-      return (*U::AllVectObj_ptr)[context];
+      if(U::AllVectObj_ptr)
+      {
+        //const std::vector<std::shared_ptr<U> > temp;
+        return (*U::AllVectObj_ptr)[context];
+        //return std::vector<std::shared_ptr<U> > (0);
+      }
+      
    }
 

XIOS/dev/dev_trunk_omp/src/object_template_impl.hpp

@@ -426 +426 @@
    const vector<T*> CObjectTemplate<T>::getAll()
    {
+     int mycheck = CObjectFactory::CheckObjectVector<T>();
+     if(mycheck==0)
+     {
+       vector<T*> vect;
+       return vect;
+     }
      const vector< std::shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>(CObjectFactory::GetCurrentContextId());
      vector<T*> vect;

XIOS/dev/dev_trunk_omp/src/test/test_omp.f90

@@ -45 +45 @@
     CALL MPI_COMM_RANK(MPI_COMM_WORLD,rank,ierr)
     CALL MPI_COMM_SIZE(MPI_COMM_WORLD,size,ierr)
-    if(rank < size-2) then
+    if(rank < size-4) then
 
     !$omp parallel default(firstprivate)