Changeset 1009

Timestamp:

Oct 7, 2008, 11:44:36 AM (16 years ago)

Author:

lsce

Message:

• Changed variable name OCEAN to type_ocean in physiq.def
• Removed test of coherence between CPP_VEGET and ok_veget (later to be readded in surf_land_orchdiee)

JG

Location:

LMDZ4/trunk/libf/phylmd

Files:

• conf_phys.F90 (modified) (7 diffs)
• pbl_surface_mod.F90 (modified) (1 diff)

LMDZ4/trunk/libf/phylmd/conf_phys.F90

@@ -39 +39 @@
 
 !
-! ocean:      type d'ocean (force, slab, couple)
+! type_ocean:      type d'ocean (force, slab, couple)
+! version_ocean:   version d'ocean (opa8/nemo pour type_ocean=couple ou 
+!                                   sicOBS pour type_ocean=slab)
 ! ok_veget:   type de modele de vegetation
 ! ok_journe:  sorties journalieres
@@ -51 +53 @@
 
 ! Sortie:
-  character (len = 6)  :: ocean
   logical              :: ok_newmicro
   integer              :: iflag_radia
@@ -61 +62 @@
   integer              :: iflag_ratqs
 
-  character (len = 6),SAVE  :: ocean_omp
+  character (len = 6),SAVE  :: type_ocean_omp, version_ocean_omp, ocean_omp
   logical,SAVE              :: ok_veget_omp, ok_newmicro_omp
   logical,SAVE        :: ok_journe_omp, ok_mensuel_omp, ok_instan_omp, ok_hf_omp        
@@ -129 +130 @@
 
 !$OMP MASTER 
-!Config Key  = OCEAN 
+!Config Key  = type_ocean 
 !Config Desc = Type d'ocean
 !Config Def  = force
 !Config Help = Type d'ocean utilise: force, slab,couple
 !
-  ocean_omp = 'force '
+  type_ocean_omp = 'force '
+  call getin('type_ocean', type_ocean_omp)
+!
+!$OMP MASTER 
+!Config Key  = version_ocean 
+!Config Desc = Version d'ocean
+!Config Def  = xxxxxx
+!Config Help = Version d'ocean utilise: opa8/nemo/sicOBS/xxxxxx
+!
+  version_ocean_omp = 'xxxxxx'
+  call getin('version_ocean', version_ocean_omp)
+
+!$OMP MASTER 
+!Config Key  = OCEAN
+!Config Desc = Old parameter name for type_ocean
+!Config Def  = yyyyyy
+!Config Help = This is only for testing purpose
+!
+  ocean_omp = 'yyyyyy'
   call getin('OCEAN', ocean_omp)
+  IF (ocean_omp /= 'yyyyyy') THEN
+     WRITE(numout,*)'ERROR!! Old variable name OCEAN used in parmeter file.'
+     WRITE(numout,*)'Variable OCEAN has been replaced by the variable type_ocean.'
+     WRITE(numout,*)'You have to update your parameter file physiq.def to succed running'
+     CALL abort_gcm('conf_phys','Variable OCEAN no longer existing, use variable name type_ocean',1)
+  END IF
+
 !
 !Config Key  = VEGET 
@@ -1175 +1201 @@
     lev_histmth = lev_histmth_omp
 
-    ocean = ocean_omp
+    type_ocean = type_ocean_omp
+    version_ocean = version_ocean_omp
     ok_veget = ok_veget_omp
     ok_newmicro = ok_newmicro_omp
@@ -1231 +1258 @@
     ok_hines = ok_hines_omp
     
-
-! 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'
+! Test of coherence between type_ocean and version_ocean
+    IF (type_ocean=='couple' .AND. (version_ocean/='opa8' .OR. version_ocean/='nemo') ) THEN
+       WRITE(numout,*)' ERROR version_ocean=',version_ocean,' not valid in coupled configuration'
+       CALL abort_gcm('conf_phys','version_ocean not valid',1)
+    END IF
+
+    IF (type_ocean=='slab' .AND. version_ocean/='xxxxxx') THEN
        version_ocean='sicOBS'
-    ELSE
-       WRITE(numout,*)' ERROR ocean not valid : ocean= ', ocean
-       CALL abort_gcm('conf_phys','ocean not valid',1)
+    ELSE IF (type_ocean=='slab' .AND. version_ocean/='sicOBS') THEN
+       WRITE(numout,*)' ERROR version_ocean=',version_ocean,' not valid with slab ocean'
+       CALL abort_gcm('conf_phys','version_ocean not valid',1)
     END IF
 
@@ -1254 +1275 @@
   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

LMDZ4/trunk/libf/phylmd/pbl_surface_mod.F90

@@ -157 +157 @@
       CALL abort_gcm(modname,abort_message,1)
     ENDIF
-
-!****************************************************************************************
-! Test of coherence between variable ok_veget and cpp key CPP_VEGET
-!
-!****************************************************************************************
-    IF (ok_veget) THEN
-#ifndef CPP_VEGET
-       abort_message='Pb de coherence: ok_veget = .true. mais CPP_VEGET = .false.'
-       CALL abort_gcm(modname,abort_message,1)
-#endif
-    ENDIF
-
 
   END SUBROUTINE pbl_surface_init