Changeset 1981 for trunk

Timestamp:

Jul 31, 2018, 7:02:27 PM (6 years ago)

Author:

emillour

Message:

Venus physics:
Follow-up of longer tracer names in the dynamics and addition of
init_print_control module variables in conf_phys.
EM

Location:

trunk/LMDZ.VENUS/libf/phyvenus

Files:

• conf_phys.F90 (modified) (4 diffs)
• infotrac_phy.F90 (modified) (4 diffs)

trunk/LMDZ.VENUS/libf/phyvenus/conf_phys.F90

@@ -7 +7 @@
   subroutine conf_phys(ok_journe, ok_mensuel, ok_instan, &
  &                     if_ebil)
-   !use init_print_control_mod, only: init_print_control
-   !use print_control_mod, only: lunout
-   use IOIPSL
+   use init_print_control_mod, only: init_print_control
+   use print_control_mod, only: lunout
+   use IOIPSL, only: getin
 
    implicit none
 
-#include "YOMCST.h"
-#include "clesphys.h"
-#include "compbl.h"
+   include "YOMCST.h"
+   include "clesphys.h"
+   include "compbl.h"
 
 ! ok_journe:  sorties journalieres
@@ -23 +23 @@
 
 ! Sortie:
-  logical              :: ok_journe, ok_mensuel, ok_instan        
-  integer              :: if_ebil
-
-! Local
-  integer              :: numout = 6
+  logical,intent(out)  :: ok_journe, ok_mensuel, ok_instan        
+  integer,intent(out)  :: if_ebil
+
 
 
@@ -37 +35 @@
 !
 !--- Ca lit le physiq.def ---
+
+       ! initialize print_control module variables
+       call init_print_control 
 
 !******************* parametres anciennement lus dans gcm.def
@@ -481 +482 @@
 !
 
-  write(numout,*)' ##############################################'
-  write(numout,*)' Configuration des parametres de la physique: '
-  write(numout,*)' cycle_diurne = ', cycle_diurne
-  write(numout,*)' soil_model = ', soil_model
-  write(numout,*)' ok_orodr = ', ok_orodr
-  write(numout,*)' ok_orolf = ', ok_orolf
-  write(numout,*)' ok_gw_nonoro = ', ok_gw_nonoro
-  write(numout,*)' nbapp_rad = ', nbapp_rad
-  write(numout,*)' nbapp_chim = ', nbapp_chim
-  write(numout,*)' iflag_con = ', iflag_con
-  write(numout,*)' Sortie journaliere = ', ok_journe
-  write(numout,*)' Sortie mensuelle = ', ok_mensuel
-  write(numout,*)' Sortie instantanee = ', ok_instan
-  write(numout,*)' frequence sorties = ', ecriphy  
-  write(numout,*)' Sortie bilan d''energie, if_ebil =', if_ebil
-  write(numout,*)' Excentricite = ',R_ecc
-  write(numout,*)' Equinoxe = ',R_peri
-  write(numout,*)' Inclinaison =',R_incl
-  write(numout,*)' tr_scheme = ', tr_scheme
-  write(numout,*)' iflag_pbl = ', iflag_pbl
-  write(numout,*)' z0 = ',z0 
-  write(numout,*)' lmixmin = ',lmixmin 
-  write(numout,*)' ksta = ',ksta 
-  write(numout,*)' ok_kzmin = ',ok_kzmin 
-  write(numout,*)' inertie = ', inertie 
-  write(numout,*)' clmain = ',cclmain
-  write(numout,*)' iflag_ajs = ', iflag_ajs
-  write(numout,*)' lev_histins = ',lev_histins 
-  write(numout,*)' lev_histday = ',lev_histday 
-  write(numout,*)' lev_histmth = ',lev_histmth 
-  write(numout,*)' reinit_trac = ',reinit_trac
-  write(numout,*)' ok_cloud = ',ok_cloud
-  write(numout,*)' cl_scheme = ',cl_scheme
-  write(numout,*)' ok_chem = ',ok_chem
-  write(numout,*)' ok_sedim = ',ok_sedim
-  write(numout,*)' nb_mode = ',nb_mode
-  write(numout,*)' callnlte = ',callnlte
-  write(numout,*)' nltemodel = ',nltemodel
-  write(numout,*)' callnirco2 = ',callnirco2
-  write(numout,*)' nircorr = ',nircorr
-  write(numout,*)' callthermos = ',callthermos
-  write(numout,*)' solvarmod = ',solvarmod
-  write(numout,*)' solarcondate = ',solarcondate
-  write(numout,*)' euveff = ',euveff
-
-  return
-!#endif
+  write(lunout,*)' ##############################################'
+  write(lunout,*)' Configuration des parametres de la physique: '
+  write(lunout,*)' cycle_diurne = ', cycle_diurne
+  write(lunout,*)' soil_model = ', soil_model
+  write(lunout,*)' ok_orodr = ', ok_orodr
+  write(lunout,*)' ok_orolf = ', ok_orolf
+  write(lunout,*)' ok_gw_nonoro = ', ok_gw_nonoro
+  write(lunout,*)' nbapp_rad = ', nbapp_rad
+  write(lunout,*)' nbapp_chim = ', nbapp_chim
+  write(lunout,*)' iflag_con = ', iflag_con
+  write(lunout,*)' Sortie journaliere = ', ok_journe
+  write(lunout,*)' Sortie mensuelle = ', ok_mensuel
+  write(lunout,*)' Sortie instantanee = ', ok_instan
+  write(lunout,*)' frequence sorties = ', ecriphy  
+  write(lunout,*)' Sortie bilan d''energie, if_ebil =', if_ebil
+  write(lunout,*)' Excentricite = ',R_ecc
+  write(lunout,*)' Equinoxe = ',R_peri
+  write(lunout,*)' Inclinaison =',R_incl
+  write(lunout,*)' tr_scheme = ', tr_scheme
+  write(lunout,*)' iflag_pbl = ', iflag_pbl
+  write(lunout,*)' z0 = ',z0 
+  write(lunout,*)' lmixmin = ',lmixmin 
+  write(lunout,*)' ksta = ',ksta 
+  write(lunout,*)' ok_kzmin = ',ok_kzmin 
+  write(lunout,*)' inertie = ', inertie 
+  write(lunout,*)' clmain = ',cclmain
+  write(lunout,*)' iflag_ajs = ', iflag_ajs
+  write(lunout,*)' lev_histins = ',lev_histins 
+  write(lunout,*)' lev_histday = ',lev_histday 
+  write(lunout,*)' lev_histmth = ',lev_histmth 
+  write(lunout,*)' reinit_trac = ',reinit_trac
+  write(lunout,*)' ok_cloud = ',ok_cloud
+  write(lunout,*)' cl_scheme = ',cl_scheme
+  write(lunout,*)' ok_chem = ',ok_chem
+  write(lunout,*)' ok_sedim = ',ok_sedim
+  write(lunout,*)' nb_mode = ',nb_mode
+  write(lunout,*)' callnlte = ',callnlte
+  write(lunout,*)' nltemodel = ',nltemodel
+  write(lunout,*)' callnirco2 = ',callnirco2
+  write(lunout,*)' nircorr = ',nircorr
+  write(lunout,*)' callthermos = ',callthermos
+  write(lunout,*)' solvarmod = ',solvarmod
+  write(lunout,*)' solarcondate = ',solarcondate
+  write(lunout,*)' euveff = ',euveff
+
   end subroutine conf_phys
 

trunk/LMDZ.VENUS/libf/phyvenus/infotrac_phy.F90

@@ -17 +17 @@
 
 ! tracer names
-  CHARACTER(len=20),ALLOCATABLE,DIMENSION(:),SAVE :: tname
-  CHARACTER(len=23),ALLOCATABLE,DIMENSION(:),SAVE :: ttext ! tracer long name for diagnostics
+  CHARACTER(len=30),ALLOCATABLE,DIMENSION(:),SAVE :: tname
+  CHARACTER(len=33),ALLOCATABLE,DIMENSION(:),SAVE :: ttext ! tracer long name for diagnostics
 !$OMP THREADPRIVATE(tname,ttext)
 
@@ -25 +25 @@
   SUBROUTINE init_infotrac_phy(iflag_trac_,nqtot_,tname_,ttext_)
   ! Initialize module variables
+  
+  USE print_control_mod, ONLY: lunout
   IMPLICIT NONE
   
@@ -33 +35 @@
   
   INTEGER :: iq
+  CHARACTER(LEN=30) :: modname="init_infotrac_phy"
+  CHARACTER(LEN=50) :: abort_message
   
   iflag_trac=iflag_trac_
@@ -40 +44 @@
   ALLOCATE(ttext(nqtot))
   DO iq=1,nqtot
+    if (len_trim(tname_(iq)).gt.len(tname(iq))) then
+      abort_message="init_infotrac_phy error; tname_() too long!"
+      call abort_physic(modname,abort_message,1)
+    endif
     tname(iq)=tname_(iq)
     ttext(iq)=ttext_(iq)