Changeset 995 for LMDZ4/trunk

Timestamp:

Sep 9, 2008, 3:17:08 PM (16 years ago)

Author:

lsce

Message:

• Modifications liées au calcul des nouveau sous-fractions
• Nettoyage de ocean slab : il reste uniquement la version avec glace de mer forcé
• Nouveaux variables pour distiguer la version et type d'ocean : type_ocean=force/slab/couple, version_ocean=opa8/nemo pour couplé ou version_ocean=sicOBS pour slab

JG

Location:

LMDZ4/trunk/libf

Files:

• dyn3d/abort_gcm.F (modified) (1 diff)
• dyn3d/etat0_netcdf.F (modified) (8 diffs)
• dyn3d/limit_netcdf.F (modified) (3 diffs)
• dyn3dpar/abort_gcm.F (modified) (1 diff)
• dyn3dpar/leapfrog_p.F (modified) (1 diff)
• dyn3dpar/parallel.F90 (modified) (2 diffs)

LMDZ4/trunk/libf/dyn3d/abort_gcm.F

@@ -19 +19 @@
 C         ierr    = severity of situation ( = 0 normal )
 
-      character*20 modname
+      character*(*) modname
       integer ierr
-      character*80 message
+      character*(*) message
 
       write(lunout,*) 'in abort_gcm'

LMDZ4/trunk/libf/dyn3d/etat0_netcdf.F

@@ -11 +11 @@
       USE fonte_neige_mod
       USE pbl_surface_mod
-      USE ocean_slab_mod
-      USE surface_data,     ONLY : ocean, ok_veget
       USE phys_state_var_mod
       !
@@ -46 +44 @@
       REAL :: alblw(klon,nbsrf)
       REAL :: tsoil(klon,nsoilmx,nbsrf) 
-cIM "slab" ocean
-      REAL :: tslab(klon), seaice(klon)
       REAL :: frugs(klon,nbsrf), agesno(klon,nbsrf)
       REAL :: rugmer(klon)
@@ -113 +109 @@
       real zx_tmp_2d(iim,jjp1)
 
-      REAL :: dummy(klon, nbsrf)
+      REAL :: dummy
 
       logical              :: ok_newmicro
@@ -152 +148 @@
 !      CALL defrun_new(99,.TRUE.,clesphy0)
       CALL conf_gcm( 99, .TRUE. , clesphy0 )
-      call conf_phys(ocean, ok_veget, ok_journe, ok_mensuel, ok_instan, &
+      call conf_phys(ok_journe, ok_mensuel, ok_instan,                  &
      &                 ok_hf,                                           &
      &                 solarlong0,seuil_inversion,                      &
@@ -418 +414 @@
      .    jjm, rlonu, rlatv , interbar )
       !
-cIM "slab" ocean
-      varname = 'tslab'
-      tslab(:) = 0.0
-      CALL startget(varname,iip1,jjp1,rlonv,rlatu,klon,tslab,0.0,
-     .     jjm, rlonu, rlatv , interbar )
-c
-      varname = 'seaice'
-      seaice(:) = 0.0
-      CALL startget(varname,iip1,jjp1,rlonv,rlatu,klon,seaice,0.0,
-     .     jjm, rlonu, rlatv , interbar )
-      !
       varname = 'rugmer'
       rugmer(:) = 0.0
@@ -710 +695 @@
       q_ancien = 0.
       agesno = 0.
-cIM "slab" ocean
-      tslab(1:klon) = ftsol(1:klon,is_oce)
-      seaice = 0. !kg m-2
-c
       frugs(1:klon,is_oce) = rugmer(1:klon)
       frugs(1:klon,is_ter) = MAX(1.0e-05, zstd(1:klon)*zsig(1:klon)/2.0)
@@ -729 +710 @@
 c avec les valeurs qui vont etre ecrit dans startphy.nc
 c
-      dummy(:,:) = 1.0
-      ocean = "slab"
+      dummy = 1.0
       pbl_tke(:,:,:) = 1.e-8 
       zmax0(:) = 40.
@@ -745 +725 @@
       call pbl_surface_init(qsol, fder, snsrf, qsolsrf,
      $     evap, frugs, agesno, tsoil)
-      call ocean_slab_init(dummy(1,1), tslab, seaice, dummy(:,:))
 
       call phyredem("startphy.nc")

LMDZ4/trunk/libf/dyn3d/limit_netcdf.F

@@ -1177 +1177 @@
       ENDDO
 c
+c Ecriture de fichier limit toujours en simple precision, NF_FLOAT
       PRINT*, 'Ecriture du fichier limit'
 c
@@ -1237 +1238 @@
       epais(2) = 1
 c
-#ifdef NC_DOUBLE
-      ierr = NF_PUT_VAR1_DOUBLE (nid,id_tim,k,DBLE(k))
-c
-      IF (newlmt ) THEN
-          ierr = NF_PUT_VARA_DOUBLE (nid,id_FOCE,debut,epais
-     $        ,pctsrf_t(1,is_oce,k))
-          ierr = NF_PUT_VARA_DOUBLE (nid,id_FSIC,debut,epais
-     $        ,pctsrf_t(1,is_sic,k))
-          ierr = NF_PUT_VARA_DOUBLE (nid,id_FTER,debut,epais
-     $        ,pctsrf_t(1,is_ter,k))
-          ierr = NF_PUT_VARA_DOUBLE (nid,id_FLIC,debut,epais
-     $        ,pctsrf_t(1,is_lic,k))
-      ELSE 
-          ierr = NF_PUT_VARA_DOUBLE (nid,id_NAT,debut,epais
-     $        ,phy_nat(1,k))
-      ENDIF 
-c
-      ierr = NF_PUT_VARA_DOUBLE (nid,id_SST,debut,epais,phy_sst(1,k))
-      ierr = NF_PUT_VARA_DOUBLE (nid,id_BILS,debut,epais,phy_bil(1,k))
-      ierr = NF_PUT_VARA_DOUBLE (nid,id_ALB,debut,epais,phy_alb(1,k))
-      ierr = NF_PUT_VARA_DOUBLE (nid,id_RUG,debut,epais,phy_rug(1,k))
-#else
       ierr = NF_PUT_VAR1_REAL (nid,id_tim,k,FLOAT(k))
       IF (newlmt ) THEN
@@ -1277 +1256 @@
       ierr = NF_PUT_VARA_REAL (nid,id_ALB,debut,epais,phy_alb(1,k))
       ierr = NF_PUT_VARA_REAL (nid,id_RUG,debut,epais,phy_rug(1,k))
-#endif
 c
       ENDDO

LMDZ4/trunk/libf/dyn3dpar/abort_gcm.F

@@ -19 +19 @@
 C         ierr    = severity of situation ( = 0 normal )
 
-      character (len=20) :: modname
+      character (len=*) :: modname
       integer ierr
-      character (len=80) :: message
+      character (len=*) :: message
 
       write(lunout,*) 'in abort_gcm'

LMDZ4/trunk/libf/dyn3dpar/leapfrog_p.F

@@ -324 +324 @@
 c$OMP MASTER
       ItCount=ItCount+1
-      if (MOD(ItCount,1)==0) then
+      if (MOD(ItCount,1)==1) then
         debug=.true.
       else

LMDZ4/trunk/libf/dyn3dpar/parallel.F90

@@ -157 +157 @@
     use mod_prism_proto
 #endif
-      use surface_data, only : ocean
+      use surface_data, only : type_ocean
       implicit none
 
@@ -170 +170 @@
       deallocate(jj_nb_para)
 
-      if (ocean == 'couple') then
+      if (type_ocean == 'couple') then
 #ifdef CPP_COUPLE
          call prism_terminate_proto(ierr)