Changeset 2321

Timestamp:

Jul 6, 2015, 6:22:14 PM (9 years ago)

Author:

Ehouarn Millour

Message:

Create the "obsolete" directory where old and unused stuff should go. And move some obsolete routines there.
Minor correction in "print_control_mod": use "opened" argument to inquire instead of "exist".
EM

Location:

LMDZ5/trunk/libf

Files:

• obsolete (added)
• obsolete/LIST.txt (added)
• obsolete/ecribin.F90 (moved) (moved from LMDZ5/trunk/libf/phylmd/ecribin.F90)
• obsolete/ecrireg.F90 (moved) (moved from LMDZ5/trunk/libf/phylmd/ecrireg.F90)
• obsolete/inistats.F90 (moved) (moved from LMDZ5/trunk/libf/phylmd/inistats.F90)
• obsolete/mkstat.F90 (moved) (moved from LMDZ5/trunk/libf/phylmd/mkstat.F90)
• obsolete/statto.h (moved) (moved from LMDZ5/trunk/libf/phylmd/statto.h)
• obsolete/wstats.F90 (moved) (moved from LMDZ5/trunk/libf/phylmd/wstats.F90)
• phylmd/physiq.F90 (modified) (2 diffs)
• phylmd/print_control_mod.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/physiq.F90

@@ -536 +536 @@
   EXTERNAL suphel    ! initialiser certaines constantes
   EXTERNAL transp    ! transport total de l'eau et de l'energie
-  EXTERNAL ecribina  ! ecrire le fichier binaire global
-  EXTERNAL ecribins  ! ecrire le fichier binaire global
-  EXTERNAL ecrirega  ! ecrire le fichier binaire regional
-  EXTERNAL ecriregs  ! ecrire le fichier binaire regional
   !IM
   EXTERNAL haut2bas  !variables de haut en bas
@@ -4304 +4300 @@
   !
 
-  !        -----------------------------------------------------------------
-  !        WSTATS: Saving statistics
-  !        -----------------------------------------------------------------
-  !        ("stats" stores and accumulates 8 key variables in file "stats.nc"
-  !        which can later be used to make the statistic files of the run:
-  !        "stats")          only possible in 3D runs !
-
-
-  IF (callstats) THEN
-
-     call wstats(klon,o_psol%name,"Surface pressure","Pa" &
-          ,2,paprs(:,1))
-     call wstats(klon,o_tsol%name,"Surface temperature","K", &
-          2,zxtsol)
-     zx_tmp_fi2d(:) = rain_fall(:) + snow_fall(:)
-     call wstats(klon,o_precip%name,"Precip Totale liq+sol", &
-          "kg/(s*m2)",2,zx_tmp_fi2d)
-     zx_tmp_fi2d(:) = rain_lsc(:) + snow_lsc(:)
-     call wstats(klon,o_plul%name,"Large-scale Precip", &
-          "kg/(s*m2)",2,zx_tmp_fi2d)
-     zx_tmp_fi2d(:) = rain_con(:) + snow_con(:)
-     call wstats(klon,o_pluc%name,"Convective Precip", &
-          "kg/(s*m2)",2,zx_tmp_fi2d)
-     call wstats(klon,o_sols%name,"Solar rad. at surf.", &
-          "W/m2",2,solsw)
-     call wstats(klon,o_soll%name,"IR rad. at surf.", &
-          "W/m2",2,sollw)
-     zx_tmp_fi2d(:) = topsw(:)-toplw(:)
-     call wstats(klon,o_nettop%name,"Net dn radiatif flux at TOA", &
-          "W/m2",2,zx_tmp_fi2d)
-
-
-
-     call wstats(klon,o_temp%name,"Air temperature","K", &
-          3,t_seri)
-     call wstats(klon,o_vitu%name,"Zonal wind","m.s-1", &
-          3,u_seri)
-     call wstats(klon,o_vitv%name,"Meridional wind", &
-          "m.s-1",3,v_seri)
-     call wstats(klon,o_vitw%name,"Vertical wind", &
-          "m.s-1",3,omega)
-     call wstats(klon,o_ovap%name,"Specific humidity", "kg/kg", &
-          3,q_seri)
-
-
-
-     IF(lafin) THEN
-        write (*,*) "Writing stats..."
-        call mkstats(ierr)
-     ENDIF
-
-  ENDIF !if callstats
-
   IF (lafin) THEN
      itau_phy = itau_phy + itap

LMDZ5/trunk/libf/phylmd/print_control_mod.F90

@@ -14 +14 @@
   IMPLICIT NONE
 
-    LOGICAL :: exist
+    LOGICAL :: opened
     INTEGER :: number
     
@@ -35 +35 @@
     IF (is_omp_root) THEN
       IF (lunout /= 5 .and. lunout /= 6) THEN
-         INQUIRE(FILE='lmdz.out_0000',EXIST=exist,NUMBER=number)
-         IF (exist) THEN
+         INQUIRE(FILE='lmdz.out_0000',OPENED=opened,NUMBER=number)
+         IF (opened) THEN
            lunout=number
          ELSE