Changeset 435

Timestamp:

2011-09-02T10:32:15+02:00 (13 years ago)

Author:

didier.solyga

Message:

Add a new getin_p subroutine for vector of characters. Replace the last getin by getin_p. Use the new function of IOPSL for writing the names of the PFTs defined by the user in the history files

Location:

branches/ORCHIDEE_EXT/ORCHIDEE

Files:

• src_parallel/ioipsl_para.f90 (modified) (2 diffs)
• src_parallel/transfert_para.f90 (modified) (2 diffs)
• src_parameters/constantes.f90 (modified) (1 diff)
• src_parameters/pft_parameters.f90 (modified) (6 diffs)
• src_sechiba/intersurf.f90 (modified) (2 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_parallel/ioipsl_para.f90

@@ -15 +15 @@
 !-
   INTERFACE getin_p
-    MODULE PROCEDURE getin_p_c,                      &
+    MODULE PROCEDURE getin_p_c,getin_p_c1,   &
          getin_p_i,getin_p_i1,getin_p_i2,&
          getin_p_r,getin_p_r1,getin_p_r2,&
@@ -51 +51 @@
   END SUBROUTINE getin_p_c  
 
+! DS 02/09/2011 : add for vector of characters
+
+  SUBROUTINE getin_p_c1(VarIn,VarOut)
+    IMPLICIT NONE    
+    CHARACTER(LEN=*),INTENT(IN) :: VarIn
+    CHARACTER(LEN=*),INTENT(INOUT) :: VarOut(:)    
+
+    IF (is_root_prc) CALL getin(VarIn,VarOut)
+    CALL bcast(VarOut)
+  END SUBROUTINE getin_p_c1 
+
 !! -- Les entiers -- !!
   

branches/ORCHIDEE_EXT/ORCHIDEE/src_parallel/transfert_para.f90

@@ -16 +16 @@
 
   INTERFACE bcast
-    MODULE PROCEDURE bcast_c,                                     &
+    MODULE PROCEDURE bcast_c, bcast_c1,                           &
                      bcast_i,bcast_i1,bcast_i2,bcast_i3,bcast_i4, &
                      bcast_r,bcast_r1,bcast_r2,bcast_r3,bcast_r4, &
@@ -75 +75 @@
 #endif
   END SUBROUTINE bcast_c
+
+! DS 02/09/2011 : add for vector of characters
+
+  SUBROUTINE bcast_c1(var1)
+  IMPLICIT NONE
+    CHARACTER(LEN=*),INTENT(INOUT) :: Var1(:)
+   
+#ifndef CPP_PARA
+    RETURN
+#else
+    CALL bcast_cgen(Var1,size(Var1))
+#endif
+  END SUBROUTINE bcast_c1
 
 !! -- Les entiers -- !!

branches/ORCHIDEE_EXT/ORCHIDEE/src_parameters/constantes.f90

@@ -1196 +1196 @@
            !Config Help = set to TRUE if constant mortality is to be activated
            !              ignored if DGVM=true!
-           CALL getin('LPJ_GAP_CONST_MORT', lpj_gap_const_mort)
+           CALL getin_p('LPJ_GAP_CONST_MORT', lpj_gap_const_mort)
            !
            !Config  Key  = HARVEST_AGRI

branches/ORCHIDEE_EXT/ORCHIDEE/src_parameters/pft_parameters.f90

@@ -481 +481 @@
       !Config  Help = the user can name the new PFTs he/she introducing for new species
       !Config  Units = NONE
-      CALL getin('PFT_NAME',pft_name)
+      CALL getin_p('PFT_NAME',pft_name)
 
       ! 5.2 A useful message to the user: correspondance between the number of the pft
@@ -1067 +1067 @@
      !Config  Help =
      !Config  Units = NONE
-     CALL getin('TYPE_OF_LAI',type_of_lai)
+     CALL getin_p('TYPE_OF_LAI',type_of_lai)
      !
      !Config  Key  = IS_TREE
@@ -1094 +1094 @@
      !Config  Help =
      !Config  Units = NONE
-     CALL getin('IS_DECIDUOUS',is_deciduous)
+     CALL getin_p('IS_DECIDUOUS',is_deciduous)
      !
      !Config  Key  = IS_EVERGREEN
@@ -1102 +1102 @@
      !Config  Help =
      !Config  Units = NONE 
-     CALL getin('IS_EVERGREEN',is_evergreen)
+     CALL getin_p('IS_EVERGREEN',is_evergreen)
      !
      !Config  Key  = IS_C3
@@ -1618 +1618 @@
      !Config  Help =
      !Config  Units = NONE
-     CALL getin('PHENO_MODEL',pheno_model)
+     CALL getin_p('PHENO_MODEL',pheno_model)
      !
      !Config  Key  = PHENO_TYPE
@@ -1781 +1781 @@
      !Config  Help =
      !Config  Units = NONE
-     CALL getin('SENESCENCE_TYPE', senescence_type) 
+     CALL getin_p('SENESCENCE_TYPE', senescence_type) 
      !
      !Config  Key  = SENESCENCE_HUM

branches/ORCHIDEE_EXT/ORCHIDEE/src_sechiba/intersurf.f90

@@ -3202 +3202 @@
          & fluxop_scinsec2, tmincels2, tmaxcels2, once2, sumscatter2  !! The various operation to be performed
 !!, tmax2, fluxop_sc2, fluxop_insec2, &
+    ! DS for externalization : write the names of the pfts in the history files
+    ! Warning : works only if you use the trunk of IOIPSL library (02/09/2011)
+    CHARACTER(LEN=80) :: global_attribute
     INTEGER(i_std)     :: i, jst
     ! SECHIBA AXIS
@@ -3912 +3915 @@
     CALL histdef(hist_id, 'Contfrac', 'Continental fraction', '1', &
          & iim,jjm, hori_id, 1,1,1, -99, 32, once(1), dt, dw)
+    !-
+    ! DS for externalization : write the names of the pfts in the history files
+    ! Warning : works only if you use the trunk of IOIPSL library (02/09/2011)
+    global_attribute="PFT_name"
+    DO i=1,nvm
+       WRITE(global_attribute(9:10),"(I2.2)") i
+       CALL histglobal_attr(hist_id,global_attribute,PFT_name(i))
+    ENDDO
     !-
     CALL histend(hist_id)