Changeset 1154 for LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar

Timestamp:

May 4, 2009, 5:24:19 PM (16 years ago)

Author:

lguez

Message:

-- Added "NetCDF95" interface in "bibio".
-- NetCDF95 uses the module "typesizes", which is part of NetCDF, so we
exclude dependency on "typesizes" in "bld.cfg".
-- Added "assert_eq" and "assert" procedures, which are in the public
part of Numerical Recipes.
-- Added some interpolation and regridding utilities in "bibio".
-- Added the ability to read an ozone climatology from a NetCDF file.
-- Commented out unused variables and code in "etat0_netcdf".
-- Updated calls to NetCDF in "etat0_netcdf": from Fortran 77
interface to Fortran 90 interface.
-- Removed useless "deallocate" at the end of "etat0_netcdf".
-- Corrected some declarations not conforming to Fortran standard, such
as "integer*4", or obsolescent such as "character*4".
-- Replaced some calls to not-standard function "float" by calls to
"real".
-- On Brodie at IDRIS, the NetCDF library compiled with OpenMP should
be used. Changed path in "arch-SX8_BRODIE.path".
-- Added warning for incompatibility of debugging options and OpenMP
parallelization in "makelmdz_fcm".

Location:

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar

Files:

• etat0_netcdf.F (modified) (15 diffs)
• temps.h (modified) (1 diff)

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/etat0_netcdf.F

@@ -9 +9 @@
       USE ioipsl
       USE dimphy
+      USE infotrac
       USE fonte_neige_mod
       USE pbl_surface_mod
       USE phys_state_var_mod
       USE filtreg_mod
-      USE infotrac
+      use regr_lat_time_climoz_m, only: regr_lat_time_climoz
 #endif
 !#endif of #ifdef CPP_EARTH
+      use netcdf, only: nf90_open, NF90_NOWRITE, nf90_close
       !
       IMPLICIT NONE
       !
-#include "netcdf.inc"
 #include "dimensions.h"
 #include "paramet.h"
@@ -43 +44 @@
       ! local variables:
       REAL :: latfi(klon), lonfi(klon)
-      REAL :: orog(iip1,jjp1), rugo(iip1,jjp1),
-     . psol(iip1, jjp1), phis(iip1, jjp1)
+      REAL :: orog(iip1,jjp1), rugo(iip1,jjp1)
+      REAL :: psol(iip1, jjp1), phis(iip1, jjp1)
       REAL :: p3d(iip1, jjp1, llm+1)
       REAL :: uvent(iip1, jjp1, llm)
@@ -52 +53 @@
       REAL,ALLOCATABLE :: q3d(:, :, :,:)
       REAL :: tsol(klon), qsol(klon), sn(klon)
-      REAL :: tsolsrf(klon,nbsrf), qsolsrf(klon,nbsrf),snsrf(klon,nbsrf) 
+!!      REAL :: tsolsrf(klon,nbsrf)
+      real qsolsrf(klon,nbsrf),snsrf(klon,nbsrf) 
       REAL :: albe(klon,nbsrf), evap(klon,nbsrf)
       REAL :: alblw(klon,nbsrf)
@@ -72 +74 @@
       !
 
-      CHARACTER*80 :: varname
+      CHARACTER(len=80) :: varname
       !
       INTEGER :: i,j, ig, l, ji,ii1,ii2
-      INTEGER :: nq
       REAL :: xpi
       !
@@ -103 +104 @@
       REAL :: w(ip1jmp1,llm)
       REAL ::phystep
-      REAL :: rugsrel(iip1*jjp1)
+CC      REAL :: rugsrel(iip1*jjp1)
       REAL :: fder(klon)
-      real zrel(iip1*jjp1),chmin,chmax
-
-      CHARACTER*80 :: visu_file
+!!      real zrel(iip1*jjp1),chmin,chmax
+
+!!      CHARACTER(len=80) :: visu_file
       INTEGER :: visuid
 
@@ -141 +142 @@
       REAL      :: solarlong0
       real :: seuil_inversion
+      logical  read_climoz ! read ozone climatology
 
       !
@@ -174 +176 @@
      &                 iflag_thermals,nsplit_thermals,tau_thermals,     &
      &                 iflag_thermals_ed,iflag_thermals_optflux,        &
-     &                 iflag_coupl,iflag_clos,iflag_wake )
+     &                 iflag_coupl,iflag_clos,iflag_wake, read_climoz )
 
       dtvr   = daysec/FLOAT(day_step)
@@ -181 +183 @@
       CALL iniconst()
       CALL inigeom()
-      !
+
       CALL inifilr()
-C init pour traceurs
+! Initialisation pour traceurs
       call infotrac_init
-      ALLOCATE(q3d(iip1, jjp1, llm,nqtot))
-!      CALL phys_state_var_init()
+      ALLOCATE(q3d(iip1, jjp1, llm, nqtot))
+!     CALL phys_state_var_init()
       !
       latfi(1) = ASIN(1.0)
@@ -243 +245 @@
 
       write(*,*)'Essai de lecture masque ocean'
-      iret = nf_open("o2a.nc", NF_NOWRITE, nid_o2a)
+      iret = nf90_open("o2a.nc", NF90_NOWRITE, nid_o2a)
       if (iret .ne. 0) then
         write(*,*)'ATTENTION!! pas de fichier o2a.nc trouve'
@@ -262 +264 @@
       else
         couple = .true.
-        iret = nf_close(nid_o2a)
+        iret = nf90_close(nid_o2a)
         call flininfo("o2a.nc", iml_omask, jml_omask, llm_tmp, ttm_tmp
      $    , nid_o2a)
@@ -399 +401 @@
      .                           maxval(qsat(:,:,:))
       !
-      WRITE(*,*) 'QSAT :', qsat(10,20,:)
+CC      WRITE(*,*) 'QSAT :', qsat(10,20,:)
       !
       varname = 'q'
@@ -410 +412 @@
       q3d(:,:,:,1) = qd(:,:,:)
       !
+
+      if (read_climoz) call regr_lat_time_climoz ! ozone climatology
+
       varname = 'tsol'
       ! This line needs to be replaced by a call to restget to get the values in the restart file
@@ -474 +479 @@
      .     jjm, rlonu, rlatv , interbar )
 c
-      rugsrel(:) = 0.0
-      IF(ok_orodr)  THEN
-        DO i = 1, iip1* jjp1
-         rugsrel(i) = MAX( 1.e-05, zstd(i)* zsig(i) /2. )
-        ENDDO
-      ENDIF
+cc      rugsrel(:) = 0.0
+cc      IF(ok_orodr)  THEN
+cc        DO i = 1, iip1* jjp1
+cc         rugsrel(i) = MAX( 1.e-05, zstd(i)* zsig(i) /2. )
+cc        ENDDO
+cc      ENDIF
 
 
@@ -750 +755 @@
 
 C     Sortie Visu pour les champs dynamiques
-      if (1.eq.0 ) then
-      print*,'sortie visu'
-      time_step = 1.
-      t_ops = 2.
-      t_wrt = 2.
-      itau = 2.
-      visu_file='Etat0_visu.nc'
-      CALL initdynav(visu_file,dayref,anneeref,time_step,
-     .              t_ops, t_wrt, visuid)
-      CALL writedynav(visuid, itau,vvent ,
-     .                uvent,tpot,pk,phi,q3d,masse,psol,phis)
-      else
+cc      if (1.eq.0 ) then
+cc      print*,'sortie visu'
+cc      time_step = 1.
+cc      t_ops = 2.
+cc      t_wrt = 2.
+cc      itau = 2.
+cc      visu_file='Etat0_visu.nc'
+cc      CALL initdynav(visu_file,dayref,anneeref,time_step,
+cc     .              t_ops, t_wrt, visuid)
+cc      CALL writedynav(visuid, itau,vvent ,
+cc     .                uvent,tpot,pk,phi,q3d,masse,psol,phis)
+cc      else
          print*,'CCCCCCCCCCCCCCCCCC REACTIVER SORTIE VISU DANS ETAT0'
-      endif
+cc      endif
       print*,'entree histclo'
       CALL histclo
@@ -772 +777 @@
       !
       END SUBROUTINE etat0_netcdf
-

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/temps.h

@@ -15 +15 @@
 
       INTEGER   itaufin
-      INTEGER*4 itau_dyn, itau_phy
-      INTEGER*4 day_ini, day_end, annee_ref, day_ref
+      INTEGER(kind=4) itau_dyn, itau_phy
+      INTEGER(kind=4) day_ini, day_end, annee_ref, day_ref
       REAL      dt
 !$OMP THREADPRIVATE(/temps/)