Changeset 1146 for XIOS/dev/branch_yushan_merged/src

Timestamp:

05/24/17 16:59:40 (7 years ago)

Author:

yushan

Message:

save modif

Location:

XIOS/dev/branch_yushan_merged/src

Files:

• io/netCdfInterface.cpp (modified) (2 diffs)
• io/netCdfInterface_impl.hpp (modified) (1 diff)
• node/context.cpp (modified) (6 diffs)
• node/file.cpp (modified) (1 diff)
• server.cpp (modified) (1 diff)
• test/test_remap_omp.f90 (modified) (6 diffs)

XIOS/dev/branch_yushan_merged/src/io/netCdfInterface.cpp

@@ -103 +103 @@
 int CNetCdfInterface::openPar(const StdString& fileName, int oMode, MPI_Comm comm, MPI_Info info, int& ncId)
 {
-  int status = xios::nc_open_par(fileName.c_str(), oMode, comm, info, &ncId);
+  int status;
+  #pragma omp critical (_netcdf)
+  status = xios::nc_open_par(fileName.c_str(), oMode, comm, info, &ncId);
   if (NC_NOERR != status)
   {
@@ -347 +349 @@
 int CNetCdfInterface::inqDimLen(int ncid, int dimId, StdSize& dimLen)
 {
-  int status = nc_inq_dimlen(ncid, dimId, &dimLen);
+  int status;
+  #pragma omp critical (_netcdf)
+  status = nc_inq_dimlen(ncid, dimId, &dimLen);
   if (NC_NOERR != status)
   {

XIOS/dev/branch_yushan_merged/src/io/netCdfInterface_impl.hpp

@@ -86 +86 @@
   int CNetCdfInterface::getVaraType(int ncid, int varId, const StdSize* start, const StdSize* count, T* data)
   {
-    int status = ncGetVaraType(ncid, varId, start, count, data);
+    int status;
+    #pragma omp critical (_netcdf)
+    status = ncGetVaraType(ncid, varId, start, count, data);
     if (NC_NOERR != status)
     {

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

@@ -21 +21 @@
   shared_ptr<CContextGroup> * CContext::root_ptr = 0;
 
-   /// ////////////////////// Définitions ////////////////////// ///
+   /// ////////////////////// Dfinitions ////////////////////// ///
 
    CContext::CContext(void)
@@ -184 +184 @@
       if (!this->hasChild())
       {
-         //oss << "<!-- No definition -->" << std::endl; // fait planter l'incrémentation
+         //oss << "<!-- No definition -->" << std::endl; // fait planter l'incrmentation
       }
       else
@@ -554 +554 @@
    void CContext::solveAllInheritance(bool apply)
    {
-     // Résolution des héritages descendants (cà d des héritages de groupes)
+     // Rsolution des hritages descendants (cd des hritages de groupes)
      // pour chacun des contextes.
       solveDescInheritance(apply);
 
-     // Résolution des héritages par référence au niveau des fichiers.
+     // Rsolution des hritages par rfrence au niveau des fichiers.
       const vector<CFile*> allFiles=CFile::getAll();
       const vector<CGrid*> allGrids= CGrid::getAll();
@@ -582 +582 @@
 
       for (unsigned int i = 0; i < allFiles.size(); i++)
-         if (!allFiles[i]->enabled.isEmpty()) // Si l'attribut 'enabled' est défini.
+         if (!allFiles[i]->enabled.isEmpty()) // Si l'attribut 'enabled' est dfini.
          {
-            if (allFiles[i]->enabled.getValue()) // Si l'attribut 'enabled' est fixé à vrai.
+            if (allFiles[i]->enabled.getValue()) // Si l'attribut 'enabled' est fix  vrai.
             {
               if ((initDate + allFiles[i]->output_freq.getValue()) < (initDate + this->getCalendar()->getTimeStep()))
@@ -609 +609 @@
 
       if (enabledFiles.size() == 0)
-         DEBUG(<<"Aucun fichier ne va être sorti dans le contexte nommé \""
+         DEBUG(<<"Aucun fichier ne va tre sorti dans le contexte nomm \""
                << getId() << "\" !");
    }
@@ -849 +849 @@
       prepareTimeseries();
 
-      //Initialisation du vecteur 'enabledFiles' contenant la liste des fichiers à sortir.
+      //Initialisation du vecteur 'enabledFiles' contenant la liste des fichiers  sortir.
       this->findEnabledFiles();
       this->findEnabledReadModeFiles();

XIOS/dev/branch_yushan_merged/src/node/file.cpp

@@ -612 +612 @@
      if (time_counter_name.isEmpty()) time_counter_name = "time_counter";
 
+     //#pragma omp critical (_checkFile)
      checkFile();
 

XIOS/dev/branch_yushan_merged/src/server.cpp

@@ -340 +340 @@
             MPI_Isend(buff,count,MPI_CHAR,i,2,intraComm,&requests[i-1]) ;
          }
+         
          MPI_Waitall(size-1,requests,status) ;
          registerContext(buff,count,it->second.leaderRank) ;

XIOS/dev/branch_yushan_merged/src/test/test_remap_omp.f90

@@ -52 +52 @@
   if(rank < size-2) then
 
-  !$omp parallel default(private)
+  !$omp parallel default(firstprivate) 
 
 !!! XIOS Initialization (get the local communicator)
@@ -60 +60 @@
   CALL MPI_COMM_SIZE(comm,size,ierr)
 
+  
+  !$omp critical (open_file)
   ierr=NF90_OPEN(src_file, NF90_NOWRITE, ncid)
+  !$omp end critical (open_file)
+
   ierr=NF90_INQ_VARID(ncid,"bounds_lon",varid)
   ierr=NF90_INQUIRE_VARIABLE(ncid, varid,dimids=dimids)
@@ -134 +138 @@
   ENDDO
 
+  !$omp critical (open_file)
   ierr=NF90_OPEN(dst_file, NF90_NOWRITE, ncid)
+  !$omp end critical (open_file)
+
+  
   ierr=NF90_INQ_VARID(ncid,"bounds_lon",varid)
   ierr=NF90_INQUIRE_VARIABLE(ncid, varid,dimids=dimids)
@@ -168 +176 @@
   CALL xios_get_handle("test",ctx_hdl)
   CALL xios_set_current_context(ctx_hdl)
-
+  
   CALL xios_set_domain_attr("src_domain", ni_glo=src_ni_glo, ibegin=src_ibegin, ni=src_ni, type="unstructured")
   CALL xios_set_domain_attr("src_domain", lonvalue_1D=src_lon, latvalue_1D=src_lat, &
@@ -189 +197 @@
                             bounds_lon_1D=src_boundslon, bounds_lat_1D=src_boundslat, nvertex=src_nvertex)
 
-
   dtime%second = 3600
   
@@ -195 +202 @@
 
   CALL xios_close_context_definition()
-  CALL xios_get_domain_attr("src_domain_regular_read", ni=src_tmp_ni, nj=src_tmp_nj)
-  ALLOCATE(tmp_field_0(src_tmp_ni*src_tmp_nj))
-
-  CALL xios_get_axis_attr("src_axis_curvilinear_read", n=src_tmp_n)
-  CALL xios_get_domain_attr("src_domain_curvilinear_read", ni=src_tmp_ni, nj=src_tmp_nj)
-  ALLOCATE(tmp_field_1(src_tmp_ni*src_tmp_nj*src_tmp_n))
-
-  CALL xios_get_domain_attr("src_domain_unstructured_read", ni=src_tmp_ni, nj=src_tmp_nj)
-  ALLOCATE(tmp_field_2(src_tmp_ni*src_tmp_nj))
-  
-  CALL xios_recv_field("src_field_regular", tmp_field_0)
-  CALL xios_recv_field("src_field_curvilinear", tmp_field_1)
-  CALL xios_recv_field("src_field_unstructured", tmp_field_2)
-
-  DO ts=1,10
-    CALL xios_update_calendar(ts)
-    CALL xios_send_field("src_field_2D",src_field_2D)
-    
-    DO i=1,src_ni
-      src_field_2D_clone(i) = src_field_2D(i)
-      IF ((23.5 * ts < src_lat(i)) .AND. (src_lat(i) < 65.5 *ts) .AND. (0 < src_lon(i)) .AND. (src_lon(i) < 30*ts)) THEN      
-        src_field_2D_clone(i) = missing_value    
-      ENDIF
-    ENDDO
-
-    CALL xios_send_field("src_field_2D_clone",src_field_2D_clone)
-    CALL xios_send_field("src_field_3D",src_field_3D)
-    CALL xios_send_field("src_field_3D_clone",src_field_3D)
-    CALL xios_send_field("src_field_4D",src_field_4D)
-    CALL xios_send_field("src_field_3D_pression",src_field_pression)
-    CALL xios_send_field("tmp_field_0",tmp_field_0)
-    CALL xios_send_field("tmp_field_1",tmp_field_1)
-    CALL xios_send_field("tmp_field_2",tmp_field_2)
-    CALL wait_us(5000) ;
-   ENDDO
-
+  
   CALL xios_context_finalize()
-
-  DEALLOCATE(src_lon, src_lat, src_boundslon,src_boundslat, src_field_2D)
-  DEALLOCATE(dst_lon, dst_lat, dst_boundslon,dst_boundslat)
-  DEALLOCATE(tmp_field_0, tmp_field_1, tmp_field_2)
-
-  
-
+  
   CALL xios_finalize()