Changeset 1492 for LMDZ5/trunk/libf/dyn3dpar

Timestamp:

Mar 8, 2011, 9:10:25 AM (14 years ago)

Author:

Laurent Fairhead

Message:

Merge of development branch LMDZ5V2.0-dev r1455:r1491 into the trunk.
Validation made locally: restart files are strictly equal between the HEAD of the trunk
and r1491 of LMDZ5V2.0-dev

---

Synchro de la branche de développement LMDZ5V2.0-dev r1455:r1491 et de la trunk
Validation faite en local: les fichiers restart sont équivalents entre la HEAD de la trunk
et la révision r1491 de LMDZ5V2.0-dev

Location:

LMDZ5/trunk

Files:

• . (modified) (1 prop)
• libf/dyn3dpar/abort_gcm.F (modified) (1 diff)
• libf/dyn3dpar/ce0l.F90 (modified) (3 diffs)
• libf/dyn3dpar/comdissipn.h (modified) (1 diff)
• libf/dyn3dpar/conf_gcm.F (modified) (2 diffs)
• libf/dyn3dpar/disvert.F (deleted)
• libf/dyn3dpar/disvert.F90 (copied) (copied from LMDZ5/branches/LMDZ5V2.0-dev/libf/dyn3dpar/disvert.F90)
• libf/dyn3dpar/etat0_netcdf.F90 (modified) (2 diffs)
• libf/dyn3dpar/friction_p.F (modified) (1 diff)
• libf/dyn3dpar/grilles_gcm_netcdf_sub.F90 (copied) (copied from LMDZ5/branches/LMDZ5V2.0-dev/libf/dyn3dpar/grilles_gcm_netcdf_sub.F90)
• libf/dyn3dpar/iniacademic.F (deleted)
• libf/dyn3dpar/iniacademic.F90 (copied) (copied from LMDZ5/branches/LMDZ5V2.0-dev/libf/dyn3dpar/iniacademic.F90)
• libf/dyn3dpar/inidissip.F (deleted)
• libf/dyn3dpar/inidissip.F90 (copied) (copied from LMDZ5/branches/LMDZ5V2.0-dev/libf/dyn3dpar/inidissip.F90)
• libf/dyn3dpar/leapfrog_p.F (modified) (1 diff)
• libf/dyn3dpar/logic.h (modified) (1 diff)
• libf/dyn3dpar/parallel.F90 (modified) (3 diffs)
• libf/dyn3dpar/ugeostr.F (deleted)
• libf/dyn3dpar/ugeostr.F90 (copied) (copied from LMDZ5/branches/LMDZ5V2.0-dev/libf/dyn3dpar/ugeostr.F90)

LMDZ5/trunk/libf/dyn3dpar/abort_gcm.F

@@ -45 +45 @@
       if (ierr .eq. 0) then
         write(lunout,*) 'Everything is cool'
-        stop
       else
         write(lunout,*) 'Houston, we have a problem ', ierr

LMDZ5/trunk/libf/dyn3dpar/ce0l.F90

@@ -22 +22 @@
   USE mod_const_mpi
   USE infotrac
+  USE parallel, ONLY: finalize_parallel
 
 #ifdef CPP_IOIPSL
@@ -55 +56 @@
        CALL abort_gcm('ce0l','In parallel mode,                         &
  &                 ce0l must be called only                             &
- &                 for 1 process and 1 task')
+ &                 for 1 process and 1 task',1)
   ENDIF
 
@@ -101 +102 @@
   END IF
 
+  IF (grilles_gcm_netcdf) THEN
+     WRITE(lunout,'(//)')
+     WRITE(lunout,*) '  ***************************  '
+     WRITE(lunout,*) '  ***  grilles_gcm_netcdf ***  '
+     WRITE(lunout,*) '  ***************************  '
+     WRITE(lunout,'(//)')
+     CALL grilles_gcm_netcdf_sub()
+  END IF
+  
+!$OMP MASTER
+  CALL finalize_parallel
+!$OMP END MASTER
+
 #endif
 ! of #ifndef CPP_EARTH #else

LMDZ5/trunk/libf/dyn3dpar/comdissipn.h

@@ -2 +2 @@
 ! $Header$
 !
-c-----------------------------------------------------------------------
-c INCLUDE comdissipn.h
+!  Attention : ce fichier include est compatible format fixe/format libre
+!                 veillez à n'utiliser que des ! pour les commentaires
+!                 et à bien positionner les & des lignes de continuation 
+!                 (les placer en colonne 6 et en colonne 73)
+!-----------------------------------------------------------------------
+! INCLUDE comdissipn.h
 
       REAL  tetaudiv, tetaurot, tetah, cdivu, crot, cdivh
-c
-      COMMON/comdissipn/ tetaudiv(llm),tetaurot(llm),tetah(llm)   ,
-     1                        cdivu,      crot,         cdivh
+!
+      COMMON/comdissipn/ tetaudiv(llm),tetaurot(llm),tetah(llm)   ,     &
+     &                        cdivu,      crot,         cdivh
 
-c
-c    Les parametres de ce common proviennent des calculs effectues dans 
-c             Inidissip  .
-c
-c-----------------------------------------------------------------------
+!
+!    Les parametres de ce common proviennent des calculs effectues dans 
+!             Inidissip  .
+!
+!-----------------------------------------------------------------------

LMDZ5/trunk/libf/dyn3dpar/conf_gcm.F

@@ -888 +888 @@
       ok_etat0 = .TRUE.
       CALL getin('ok_etat0',ok_etat0)
+
+!Config  Key  = grilles_gcm_netcdf
+!Config  Desc = creation de fichier grilles_gcm.nc dans create_etat0_limit
+!Config  Def  = n
+      grilles_gcm_netcdf = .FALSE.
+      CALL getin('grilles_gcm_netcdf',grilles_gcm_netcdf)
 
       write(lunout,*)' #########################################'
@@ -937 +943 @@
       write(lunout,*)' ok_limit = ', ok_limit
       write(lunout,*)' ok_etat0 = ', ok_etat0
+      write(lunout,*)' grilles_gcm_netcdf = ', grilles_gcm_netcdf
 c
       RETURN

LMDZ5/trunk/libf/dyn3dpar/etat0_netcdf.F90

@@ -98 +98 @@
   REAL    :: dummy
   LOGICAL :: ok_newmicro, ok_journe, ok_mensuel, ok_instan, ok_hf
-  LOGICAL :: ok_LES, ok_ade, ok_aie, aerosol_couple, new_aod
+  LOGICAL :: ok_LES, ok_ade, ok_aie, aerosol_couple, new_aod, callstats
   INTEGER :: iflag_radia, flag_aerosol
   REAL    :: bl95_b0, bl95_b1, fact_cldcon, facttemps, ratqsbas, ratqshaut
@@ -130 +130 @@
 !--- CONSTRUCT A GRID
   CALL conf_phys(  ok_journe, ok_mensuel, ok_instan, ok_hf, ok_LES,     &
+                   callstats,                                           &
                    solarlong0,seuil_inversion,                          &
                    fact_cldcon, facttemps,ok_newmicro,iflag_radia,      &

LMDZ5/trunk/libf/dyn3dpar/friction_p.F

@@ -34 +34 @@
 
 ! arguments:
-      REAL,INTENT(out) :: ucov( iip1,jjp1,llm )
-      REAL,INTENT(out) :: vcov( iip1,jjm,llm )
+      REAL,INTENT(inout) :: ucov( iip1,jjp1,llm )
+      REAL,INTENT(inout) :: vcov( iip1,jjm,llm )
       REAL,INTENT(in) :: pdt ! time step
 

LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F

@@ -996 +996 @@
           enddo
 !$OMP END DO
-!$OMP SINGLE
+!$OMP MASTER
           dpfi(ijb:ije)=0
-!$OMP END SINGLE
+!$OMP END MASTER
           ijb=ij_begin
           ije=ij_end

LMDZ5/trunk/libf/dyn3dpar/logic.h

@@ -10 +10 @@
      &  statcl,conser,apdiss,apdelq,saison,ecripar,fxyhypb,ysinus       &
      &  ,read_start,ok_guide,ok_strato,ok_gradsfile                     &
-     &  ,ok_limit,ok_etat0
+     &  ,ok_limit,ok_etat0,grilles_gcm_netcdf
 
       LOGICAL purmats,forward,leapf,apphys,statcl,conser,               &
      & apdiss,apdelq,saison,ecripar,fxyhypb,ysinus                      &
      &  ,read_start,ok_guide,ok_strato,ok_gradsfile                     &
-     &  ,ok_limit,ok_etat0
+     &  ,ok_limit,ok_etat0,grilles_gcm_netcdf
 
       INTEGER iflag_phys

LMDZ5/trunk/libf/dyn3dpar/parallel.F90

@@ -5 +5 @@
   USE mod_const_mpi
     
-    LOGICAL,SAVE :: using_mpi
+    LOGICAL,SAVE :: using_mpi=.TRUE.
     LOGICAL,SAVE :: using_omp
     
@@ -208 +208 @@
       integer :: ierr
       integer :: i
-      deallocate(jj_begin_para)
-      deallocate(jj_end_para)
-      deallocate(jj_nb_para)
+
+      if (allocated(jj_begin_para)) deallocate(jj_begin_para)
+      if (allocated(jj_end_para))   deallocate(jj_end_para)
+      if (allocated(jj_nb_para))    deallocate(jj_nb_para)
 
       if (type_ocean == 'couple') then
@@ -549 +550 @@
         
    
-    /*  
-  Subroutine verif_hallo(Field,ij,ll,up,down)
-    implicit none
-#include "dimensions.h"
-#include "paramet.h"    
-    include 'mpif.h'
-    
-      INTEGER :: ij,ll
-      REAL, dimension(ij,ll) :: Field
-      INTEGER :: up,down 
-      
-      REAL,dimension(ij,ll): NewField
-      
-      NewField=0
-      
-      ijb=ij_begin
-      ije=ij_end
-      if (pole_nord) 
-      NewField(ij_be       
-*/
+!  Subroutine verif_hallo(Field,ij,ll,up,down)
+!    implicit none
+!#include "dimensions.h"
+!#include "paramet.h"    
+!    include 'mpif.h'
+!    
+!      INTEGER :: ij,ll
+!      REAL, dimension(ij,ll) :: Field
+!      INTEGER :: up,down 
+!      
+!      REAL,dimension(ij,ll): NewField
+!      
+!      NewField=0
+!      
+!      ijb=ij_begin
+!      ije=ij_end
+!      if (pole_nord) 
+!      NewField(ij_be       
+
   end module parallel