Changeset 996 for LMDZ4/trunk/libf/phylmd/conf_phys.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/conf_phys.F90 (modified) (7 diffs)

LMDZ4/trunk/libf/phylmd/conf_phys.F90

@@ -5 +5 @@
 !
 
-  subroutine conf_phys(ocean, ok_veget, ok_journe, ok_mensuel, ok_instan, ok_hf, &
+  subroutine conf_phys(ok_journe, ok_mensuel, ok_instan, ok_hf, &
  &                     solarlong0,seuil_inversion, &
  &                     fact_cldcon, facttemps,ok_newmicro,iflag_radia,&
@@ -16 +16 @@
 
    use IOIPSL
-!!!!   USE surface_data,     ONLY : ocean, ok_veget
+   USE surface_data
 
    implicit none
@@ -51 +51 @@
 ! Sortie:
   character (len = 6)  :: ocean
-  logical              :: ok_veget, ok_newmicro
+  logical              :: ok_newmicro
   integer              :: iflag_radia
   logical              :: ok_journe, ok_mensuel, ok_instan, ok_hf
@@ -116 +116 @@
   REAL,SAVE :: ecrit_hf_omp, ecrit_day_omp, ecrit_mth_omp, ecrit_reg_omp
   REAL,SAVE :: ecrit_tra_omp
-  LOGICAL, SAVE :: ok_slab_sicOBS_omp
   REAL,SAVE :: cvl_corr_omp
   LOGICAL,SAVE :: ok_lic_melt_omp
@@ -997 +996 @@
   call getin('ecrit_reg',ecrit_reg_omp)
 !
-!
-!
-!Config Key  = ok_slab_sicOBS
-!Config Desc =
-!Config Def  = .true.
-!Config Help = Pour faire tourner le slab avec fraction 
-!              de glace de mer Observee
-!
-  ok_slab_sicOBS_omp = .true.
-  call getin('ok_slab_sicOBS', ok_slab_sicOBS_omp)
 !
 !
@@ -1198 +1187 @@
     ecrit_tra = ecrit_tra_omp
     ecrit_reg = ecrit_reg_omp
-    ok_slab_sicOBS = ok_slab_sicOBS_omp
     cvl_corr = cvl_corr_omp
     ok_lic_melt = ok_lic_melt_omp
@@ -1213 +1201 @@
 !$OMP MASTER
 
+! Attribution of new parmeters according to parameters in .def
+    IF (ocean=='couple' .OR. ocean=='opa8') THEN
+       type_ocean='couple'
+       version_ocean='opa8'
+    ELSE IF (ocean=='nemo') THEN
+       type_ocean='couple'
+       version_ocean='nemo'
+    ELSE IF (ocean=='force') THEN
+       type_ocean='force'
+       version_ocean='xxxxxx'
+    ELSE IF (ocean=='slab') THEN
+       type_ocean='slab'
+       version_ocean='sicOBS'
+    ELSE
+       WRITE(numout,*)' ERROR ocean not valid : ocean= ', ocean
+       CALL abort_gcm('conf_phys','ocean not valid',1)
+    END IF
+
   write(numout,*)' ##############################################'
   write(numout,*)' Configuration des parametres de la physique: '
   write(numout,*)' Config ocean = ', ocean
+  write(numout,*)' Type ocean = ', type_ocean
+  write(numout,*)' Version ocean = ', version_ocean
   write(numout,*)' Config veget = ', ok_veget
   write(numout,*)' Sortie journaliere = ', ok_journe