Changeset 1073 for LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/conf_phys.F90

Timestamp:

Jan 19, 2009, 2:40:26 PM (16 years ago)

Author:

Laurent Fairhead

Message:

Mise a jour de la branche par rapport au depot CVS
JG/LF

File:

• LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/conf_phys.F90 (modified) (8 diffs)

LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/conf_phys.F90

@@ -1 @@
-!
-! $Header$
 !
 !
@@ -14 +12 @@
 
    use IOIPSL
+   use surface_data, ONLY : version_ocean
    implicit none
 
@@ -33 +32 @@
 !
 ! ocean:      type d'ocean (force, slab, couple)
+! version_ocean:   version d'ocean (opa8/nemo pour ocean=couple)
 ! ok_veget:   type de modele de vegetation
 ! ok_journe:  sorties journalieres
@@ -52 +52 @@
   integer              :: iflag_cldcon
 
-  character (len = 6),SAVE  :: ocean_omp
+  character (len = 6),SAVE  :: ocean_omp, version_ocean_omp
   logical,SAVE              :: ok_veget_omp, ok_newmicro_omp
   logical,SAVE        :: ok_journe_omp, ok_mensuel_omp, ok_instan_omp, ok_hf_omp        
@@ -105 +105 @@
   ocean_omp = 'force '
   call getin('OCEAN', ocean_omp)
+!
+!Config Key  = version_ocean 
+!Config Desc = Version d'ocean
+!Config Def  = xxxxxx
+!Config Help = Version d'ocean utilise: opa8/nemo/xxxxxx
+!
+  version_ocean_omp = 'opa8'
+  call getin('version_ocean', version_ocean_omp)
 !
 !Config Key  = VEGET 
@@ -849 +857 @@
 
     ocean = ocean_omp
+    version_ocean = version_ocean_omp
     ok_veget = ok_veget_omp
     ok_newmicro = ok_newmicro_omp
@@ -886 +895 @@
     ok_lic_melt = ok_lic_melt_omp
 
+! Test of coherence between ocean and version_ocean
+    IF (ocean=='couple' .AND. (version_ocean/='opa8' .AND. 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
+
 !$OMP MASTER
 
@@ -891 +906 @@
   write(numout,*)' Configuration des parametres de la physique: '
   write(numout,*)' Config ocean = ', ocean
+  write(numout,*)' Version ocean = ', version_ocean, ' (valable si config ocean=couple)'
   write(numout,*)' Config veget = ', ok_veget
   write(numout,*)' Sortie journaliere = ', ok_journe