Changeset 1130 for trunk/LMDZ.MARS/libf/phymars/writediagsoil.F90

Timestamp:

Dec 20, 2013, 4:04:56 PM (11 years ago)

Author:

emillour

Message:

Mars GCM:
Series of changes to enable running in parallel (using LMDZ.COMMON dynamics);
Current LMDZ.MARS can still notheless be compiled and run in serial mode
"as previously".
Summary of main changes:

• Main programs (newstart, start2archive, xvik) that used to be in dyn3d have been moved to phymars.
• dyn3d/control.h is now module control_mod.F90
• rearanged input/outputs routines everywhere to handle serial/MPI cases. physdem.F => phyredem.F90 , phyetat0.F => phyetat0.F90 ; all read/write routines for startfi files are gathered in module iostart.F90
• added parallelism related routines init_phys_lmdz.F90, comgeomphy.F90, dimphy.F90, iniphysiq.F90, mod_grid_phy_lmdz.F90, mod_phys_lmdz_mpi_data.F90, mod_phys_lmdz_mpi_transfert.F90, mod_phys_lmdz_omp_data.F90, mod_phys_lmdz_omp_transfert.F90, mod_phys_lmdz_para.F90, mod_phys_lmdz_transfert_para.F90 in phymars and mod_const_mpi.F90 in dyn3d (for compliance with parallel case)
• created generic routines 'planetwide_maxval' and 'planetwide_minval', in module "planetwide_mod", that enable obtaining the min and max of a field over the whole planet.

EM

File:

• trunk/LMDZ.MARS/libf/phymars/writediagsoil.F90 (modified) (12 diffs)

trunk/LMDZ.MARS/libf/phymars/writediagsoil.F90

@@ -13 +13 @@
 
 use comsoil_h, only: nsoilmx
+use control_mod, only: ecritphy, day_step, iphysiq
+use mod_phys_lmdz_para, only : is_mpi_root, is_master, gather
+use mod_grid_phy_lmdz, only : klon_glo, Grid1Dto2D_glo
 
 implicit none
@@ -19 +22 @@
 !#include"dimphys.h"
 #include"paramet.h"
-#include"control.h"
+!#include"control.h"
 !#include"comsoil.h"
 #include"netcdf.inc"
@@ -56 +59 @@
 integer,dimension(4) :: edges,corners
 
+#ifdef CPP_PARA
+! Added to work in parallel mode
+real dx3_glop(klon_glo,nsoilmx)
+real dx3_glo(iim,jjp1,nsoilmx) ! to store a global 3D data set
+real dx2_glop(klon_glo)
+real dx2_glo(iim,jjp1)     ! to store a global 2D (surface) data set
+real px2(ngrid)
+#endif
+
 ! 1. Initialization step
 if (firstname.eq."1234567890") then
@@ -75 +87 @@
   
   ! Create output NetCDF file
-  ierr=NF_CREATE(filename,IOR(NF_CLOBBER,NF_64BIT_OFFSET),nid)
-  if (ierr.ne.NF_NOERR) then
+  if (is_master) then
+   ierr=NF_CREATE(filename,NF_CLOBBER,nid)
+   if (ierr.ne.NF_NOERR) then
     write(*,*)'writediagsoil: Error, failed creating file '//trim(filename)
     stop
-  endif
-  
+   endif
+  endif ! of if (is_master)
+
   ! Define dimensions and axis attributes
   call iniwritesoil(nid,ngrid)
@@ -89 +103 @@
 else
   ! If not an initialization call, simply open the NetCDF file
-  ierr=NF_OPEN(filename,NF_WRITE,nid)
+  if (is_master) then
+   ierr=NF_OPEN(filename,NF_WRITE,nid)
+  endif
 endif ! of if (firstname.eq."1234567890")
 
@@ -105 +121 @@
   if (name.eq.firstname) then
     ntime=ntime+1
-    date=real(zitau+1)/real(day_step)
+    date=float(zitau+1)/float(day_step)
     ! Note: day_step is known from control.h
     
-    ! Get NetCDF ID for "time"
-    ierr=NF_INQ_VARID(nid,"time",varid)
-    ! Add the current value of date to the "time" array
+    if (is_master) then
+     ! Get NetCDF ID for "time"
+     ierr=NF_INQ_VARID(nid,"time",varid)
+     ! Add the current value of date to the "time" array
 !#ifdef NC_DOUBLE
-!    ierr=NF_PUT_VARA_DOUBLE(nid,varid,ntime,1,date)
+!     ierr=NF_PUT_VARA_DOUBLE(nid,varid,ntime,1,date)
 !#else
-    ierr=NF_PUT_VARA_REAL(nid,varid,ntime,1,date)
+     ierr=NF_PUT_VARA_REAL(nid,varid,ntime,1,date)
 !#endif
-    if (ierr.ne.NF_NOERR) then
+     if (ierr.ne.NF_NOERR) then
       write(*,*)"writediagsoil: Failed writing date to time variable"
       stop 
-    endif
+     endif
+    endif ! of if (is_master)
   endif ! of if (name.eq.firstname)
 
@@ -125 +143 @@
 if (dimpx.eq.3) then ! Case of a 3D variable
   ! A. Recast data along 'dynamics' grid
+#ifdef CPP_PARA
+  ! gather field on a "global" (without redundant longitude) array
+  call Gather(px,dx3_glop)
+!$OMP MASTER
+  if (is_mpi_root) then
+    call Grid1Dto2D_glo(dx3_glop,dx3_glo)
+    ! copy dx3_glo() to dx3(:) and add redundant longitude
+    data3(1:iim,:,:)=dx3_glo(1:iim,:,:)
+    data3(iip1,:,:)=data3(1,:,:)
+  endif
+!$OMP END MASTER
+!$OMP BARRIER
+#else
   do l=1,nsoilmx
     ! handle the poles
@@ -140 +171 @@
     enddo
   enddo
+#endif
   
   ! B. Write (append) the variable to the NetCDF file
+  if (is_master) then
   ! B.1. Get the ID of the variable
   ierr=NF_INQ_VARID(nid,name,varid)
@@ -179 +212 @@
                " to file "//trim(filename)//" at time",date
   endif
+  endif ! of if (is_master)
 
 elseif (dimpx.eq.2) then ! Case of a 2D variable
+
   ! A. Recast data along 'dynamics' grid
+#ifdef CPP_PARA
+  ! gather field on a "global" (without redundant longitude) array
+  px2(:)=px(:,1)
+  call Gather(px2,dx2_glop)
+!$OMP MASTER
+  if (is_mpi_root) then
+    call Grid1Dto2D_glo(dx2_glop,dx2_glo)
+    ! copy dx3_glo() to dx3(:) and add redundant longitude
+    data2(1:iim,:)=dx2_glo(1:iim,:)
+    data2(iip1,:)=data2(1,:)
+  endif
+!$OMP END MASTER
+!$OMP BARRIER
+#else
   ! handle the poles
   do i=1,iip1
@@ -195 +244 @@
     data2(iip1,j)=data2(1,j) ! extra (modulo) longitude
   enddo
+#endif
 
   ! B. Write (append) the variable to the NetCDF file
+  if (is_master) then
   ! B.1. Get the ID of the variable
   ierr=NF_INQ_VARID(nid,name,varid)
@@ -231 +282 @@
                " to file "//trim(filename)//" at time",date
   endif
+  endif ! of if (is_master)
 
 elseif (dimpx.eq.0) then ! Case of a 0D variable
+#ifdef CPP_PARA
+  write(*,*) "writediagsoil: dimps==0 case not implemented in // mode!!"
+  stop
+#endif
   ! A. Copy data value
   data0=px(1,1)
@@ -270 +326 @@
 
 ! 4. Close the NetCDF file
-ierr=NF_CLOSE(nid)
+if (is_master) then
+  ierr=NF_CLOSE(nid)
+endif
 
 end subroutine writediagsoil