Changeset 996 for LMDZ4/trunk/libf/phylmd/phys_output_mod.F90

Timestamp:

Sep 9, 2008, 3:22:23 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

File:

• LMDZ4/trunk/libf/phylmd/phys_output_mod.F90 (modified) (2 diffs)

LMDZ4/trunk/libf/phylmd/phys_output_mod.F90

@@ -188 +188 @@
   integer, dimension(nfiles) , save :: flag_philevsSTD   = (/ 1, 1, 1, 10 /)
 
-  integer, dimension(nfiles) , save :: flag_fluxo        = (/ 1, 1, 10, 10 /)
-  integer, dimension(nfiles) , save :: flag_fluxg        = (/ 1, 1, 10, 10 /)
   integer, dimension(nfiles) , save :: flag_t_oce_sic    = (/ 1, 10, 10, 10 /)
-
-  integer, dimension(nfiles) , save :: flag_lmt_bils     = (/ 1, 1, 10, 10 /)
-  integer, dimension(nfiles) , save :: flag_tslab        = (/ 1, 1, 10, 10 /)
-  integer, dimension(nfiles) , save :: flag_seaice       = (/ 1, 1, 10, 10 /)
-  integer, dimension(nfiles) , save :: flag_siceh        = (/ 1, 1, 10, 10 /)
 
   integer, dimension(nfiles) , save :: flag_weakinv      = (/ 10, 1, 10, 10 /)
@@ -590 +583 @@
        ENDDO
 
-!IM diagnostiques flux ocean-atm ou ocean-glace de mer
-!IM pour utilisation dans un modele de "slab" ocean
- CALL histdef2d(iff,flag_fluxo,"fluxo","Flux turbulents ocean-atmosphere","W/m2")
- CALL histdef2d(iff,flag_fluxg,"fluxg","Flux turbulents ocean-glace de mer","W/m2")
  CALL histdef2d(iff,flag_t_oce_sic,"t_oce_sic","Temp mixte oce-sic","K")
 
-     IF (OCEAN.EQ.'force ') THEN
- CALL histdef2d(iff,flag_lmt_bils,"lmt_bils","Bilan au sol atmosphere forcee","W/m2")
-     ELSE IF (OCEAN.EQ.'slab  ') THEN
- CALL histdef2d(iff,flag_slab_bils,"slab_bils","Bilan au sol Slab","W/m2") 
- CALL histdef2d(iff,flag_tslab,"tslab", "Slab SST ", "K")
- CALL histdef2d(iff,flag_seaice,"seaice","Slab seaice","kg/m2") 
- CALL histdef2d(iff,flag_siceh,"siceh","Slab seaice height","m")
-     ENDIF
+ IF (ocean=='slab') & 
+      CALL histdef2d(iff,flag_slab_bils, "slab_wbils_oce","Bilan au sol sur ocean slab", "W/m2")
 
  CALL histdef2d(iff,flag_ale_bl,"ale_bl","ALE BL","m2/s2")