Changeset 461 for branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/thermosoil.f90

Timestamp:

2011-09-08T09:37:26+02:00 (13 years ago)

Author:

didier.solyga

Message:

Correct bcast functions. In sechiba modules, move var_name from save variables to local variables. Correct a save attribute to parameter attribute in constantes_mtc.f90

File:

• branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/thermosoil.f90 (modified) (5 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/thermosoil.f90

@@ -35 +35 @@
   !
   LOGICAL, SAVE                             :: l_first_thermosoil=.TRUE. !! Initialisation has to be done one time
-
-  CHARACTER(LEN=80) , SAVE                  :: var_name                  !! To store variables names for I/O
   REAL(r_std), SAVE                          :: lambda, cstgrnd, lskin, fz1, zalph
 
@@ -106 +104 @@
     REAL(r_std),DIMENSION (kjpindex), INTENT (inout)     :: soilflx          
     REAL(r_std),DIMENSION (kjpindex,nbdl), INTENT (inout):: stempdiag        !! diagnostic temp profile
-
+    ! local
     REAL(r_std),DIMENSION (kjpindex,ngrnd) :: temp
     REAL(r_std),DIMENSION (kjpindex,ngrnd-1) :: temp1
     REAL(r_std),DIMENSION (kjpindex) :: temp2
+    CHARACTER(LEN=80)                :: var_name                  !! To store variables names for I/O
+
     !
     ! do initialisation
@@ -252 +252 @@
         CALL restput_p(rest_id, var_name, nbp_glo, 1, 1, kjit, z1, 'scatter', nbp_glo, index_g)
 
-            var_name= 'pcapa'
+        var_name= 'pcapa'
         CALL restput_p(rest_id, var_name, nbp_glo, ngrnd, 1, kjit, pcapa, 'scatter', nbp_glo, index_g)
 
-            var_name= 'pcapa_en'
+        var_name= 'pcapa_en'
         CALL restput_p(rest_id, var_name, nbp_glo, ngrnd, 1, kjit, pcapa_en, 'scatter', nbp_glo, index_g)
 
-            var_name= 'pkappa'
+        var_name= 'pkappa'
         CALL restput_p(rest_id, var_name, nbp_glo, ngrnd, 1, kjit, pkappa, 'scatter', nbp_glo, index_g)
 
-            var_name= 'zdz1'
+        var_name= 'zdz1'
         CALL restput_p(rest_id, var_name, nbp_glo, ngrnd-1, 1, kjit, zdz1, 'scatter', nbp_glo, index_g)
 
-            var_name= 'zdz2'
+        var_name= 'zdz2'
         CALL restput_p(rest_id, var_name, nbp_glo, ngrnd, 1, kjit, zdz2, 'scatter', nbp_glo, index_g)
 
@@ -342 +342 @@
     ! local declaration
     INTEGER(i_std)                                     :: ier
+    CHARACTER(LEN=80)                                  :: var_name            !! To store variables names for I/O
 
     ! initialisation
@@ -466 +467 @@
         !
         ! change restart If they were not found in the restart file
-!
-!Config Key  = THERMOSOIL_TPRO
-!Config Desc = Initial soil temperature profile if not found in restart
-!Config Def  = 280.
-!Config Help = The initial value of the temperature profile in the soil if 
-!Config        its value is not found in the restart file. This should only 
-!Config        be used if the model is started without a restart file. Here
-!Config        we only require one value as we will assume a constant 
-!Config        throughout the column.
-!
+        !
+        !Config Key  = THERMOSOIL_TPRO
+        !Config Desc = Initial soil temperature profile if not found in restart
+        !Config Def  = 280.
+        !Config Help = The initial value of the temperature profile in the soil if 
+        !Config        its value is not found in the restart file. This should only 
+        !Config        be used if the model is started without a restart file. Here
+        !Config        we only require one value as we will assume a constant 
+        !Config        throughout the column.
+        !
         CALL setvar_p (ptn, val_exp,'THERMOSOIL_TPRO',280._r_std)