Changeset 1984 for LMDZ5/trunk/libf/dyn3dmem

Timestamp:

Feb 18, 2014, 10:59:29 AM (10 years ago)

Author:

Ehouarn Millour

Message:

Cleanup and update of "grilles_gcm_netcdf_sub": removed old version, removed flag "grilles_gcm_netcdf" used to trigger output of grilles_gcm.nc file (file will now always be created) and fixed writing vertical levels presnivs in the file.
JBM+EM

Location:

LMDZ5/trunk/libf/dyn3dmem

Files:

• ce0l.F90 (modified) (1 diff)
• conf_gcm.F (modified) (2 diffs)
• logic.h (modified) (3 diffs)

LMDZ5/trunk/libf/dyn3dmem/ce0l.F90

@@ -115 +115 @@
   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(masque,phis)
-  END IF
+  WRITE(lunout,'(//)')
+  WRITE(lunout,*) '  ***************************  '
+  WRITE(lunout,*) '  ***  grilles_gcm_netcdf ***  '
+  WRITE(lunout,*) '  ***************************  '
+  WRITE(lunout,'(//)')
+  CALL grilles_gcm_netcdf_sub(masque,phis)
   
 #ifdef CPP_MPI

LMDZ5/trunk/libf/dyn3dmem/conf_gcm.F

@@ -944 +944 @@
       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,*)' #########################################'
@@ -999 +993 @@
       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/dyn3dmem/logic.h

@@ -1 +1 @@
 !
-! $Id$
+! $Id: $
 !
 !
@@ -11 +11 @@
      &  statcl,conser,apdiss,apdelq,saison,ecripar,fxyhypb,ysinus       &
      &  ,read_start,ok_guide,ok_strato,ok_gradsfile                     &
-     &  ,ok_limit,ok_etat0,grilles_gcm_netcdf,hybrid
+     &  ,ok_limit,ok_etat0,hybrid
 
       COMMON/logici/ iflag_phys,iflag_trac
@@ -18 +18 @@
      & apdiss,apdelq,saison,ecripar,fxyhypb,ysinus                      &
      &  ,read_start,ok_guide,ok_strato,ok_gradsfile                     &
-     &  ,ok_limit,ok_etat0,grilles_gcm_netcdf
+     &  ,ok_limit,ok_etat0
+     
       logical hybrid ! vertical coordinate is hybrid if true (sigma otherwise)
                      ! (only used if disvert_type==2)