Changeset 258

Timestamp:

2011-06-17T14:02:59+02:00 (13 years ago)

Author:

didier.solyga

Message:

Externalized version of ORCHIDEE_OL files merged with the trunk

Location:

branches/ORCHIDEE_EXT/ORCHIDEE_OL

Files:

• AA_make (modified) (2 diffs)
• AA_make.ldef (modified) (1 diff)
• dim2_driver.f90 (modified) (5 diffs)
• forcesoil.f90 (modified) (2 diffs)
• getprec.f90 (modified) (1 diff)
• readdim2.f90 (modified) (7 diffs)
• teststomate.f90 (modified) (1 diff)
• weather.f90 (modified) (3 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE_OL/AA_make

@@ -1 +1 @@
 #-
-#- $Id: AA_make,v 1.34 2009/11/10 12:57:07 ssipsl Exp $
+#- $Id: AA_make 92 2011-02-08 13:41:26Z martial.mancip $
 #-
 MODS1 = dim2_driver.f90 \
@@ -96 +96 @@
 all_libs:
         $(M_K) libioipsl
+        $(M_K) libparallel
         $(M_K) libparameters
-        $(M_K) libparallel
         $(M_K) liborglob
         $(M_K) libstomate

branches/ORCHIDEE_EXT/ORCHIDEE_OL/AA_make.ldef

@@ -1 +1 @@
 #-
-#- $Id: AA_make.ldef,v 1.15 2008/06/30 10:48:17 ssipsl Exp $
+#- $Id: AA_make.ldef 18 2010-11-29 11:12:17Z mmaipsl $
 #-
 SHELL = /bin/sh

branches/ORCHIDEE_EXT/ORCHIDEE_OL/dim2_driver.f90

@@ -1 +1 @@
 PROGRAM driver
-!- $Header: /home/ssipsl/CVSREP/ORCHIDEE_OL/dim2_driver.f90,v 1.26 2010/04/22 15:48:59 ssipsl Exp $
+!< $HeadURL: http://forge.ipsl.jussieu.fr/orchidee/svn/trunk/ORCHIDEE_OL/dim2_driver.f90 $ 
+!< $Date: 2011-06-01 10:03:53 +0200 (Wed, 01 Jun 2011) $
+!< $Author: martial.mancip $
+!< $Revision: 254 $
 !- IPSL (2006)
 !-  This software is governed by the CeCILL licence see ORCHIDEE/ORCHIDEE_CeCILL.LIC
@@ -337 +340 @@
   itau_dep = 0
   itau_dep_rest = 0
-  itau_fin = tm-1
+  itau_fin = tm
 !-
   CALL gather2D(lon,lon_g)
@@ -358 +361 @@
      IF (itau_dep /= itau_dep_rest) THEN
         itau_dep = itau_dep_rest
-        itau_fin = itau_dep+tm-1
+        itau_fin = itau_dep+tm
      ENDIF
   ENDIF
@@ -457 +460 @@
   IF ( (dt_rest /= dt_force).AND.(itau_dep > 1) ) THEN
     itau_dep = NINT((itau_dep*dt_rest )/dt_force)
-    itau_fin = itau_dep+tm-1
+    itau_fin = itau_dep+tm
     if (debug) WRITE(numout,*) &
  & 'The time steping of the restart is different from the one ',&
@@ -1013 +1016 @@
          ENDDO
       ENDIF
-      for_swdown(:,:) = swdown(:,:)
+      DO ik=1,nbindex
+         i=ilandindex(ik)
+         j=jlandindex(ik)
+         for_swdown(i,j) = swdown(i,j)
+      ENDDO
 !----- 
 !---- Computing the buffer zone !

branches/ORCHIDEE_EXT/ORCHIDEE_OL/forcesoil.f90

@@ -76 +76 @@
   CALL Init_para(.FALSE.) 
 
-  CALL getin('NVM',nvm)
-
+  CALL getin_p('NVM',nvm)
   !-
   ! Stomate's restart files
@@ -290 +289 @@
   CALL Scatter(carbon,carbon_loc)
 
+!!$ DS 16/06/2011 : calling the new_values of soilcarbon parameters before loop
+     !
+     CALL getin_p('FRAC_CARB_AA',frac_carb_aa)
+     CALL getin_p('FRAC_CARB_AP',frac_carb_ap)   
+     CALL getin_p('FRAC_CARB_SS',frac_carb_ss)
+     CALL getin_p('FRAC_CARB_SA',frac_carb_sa)
+     CALL getin_p('FRAC_CARB_SP',frac_carb_sp)
+     CALL getin_p('FRAC_CARB_PP',frac_carb_pp)
+     CALL getin_p('FRAC_CARB_PA',frac_carb_pa)
+     CALL getin_p('FRAC_CARB_PS',frac_carb_ps)
+     !
+     CALL getin_p('ACTIVE_TO_PASS_CLAY_FRAC',active_to_pass_clay_frac)
+     CALL getin_p('CARBON_TAU_IACTIVE',carbon_tau_iactive)
+     CALL getin_p('CARBON_TAU_ISLOW',carbon_tau_islow)
+     CALL getin_p('CARBON_TAU_IPASSIVE',carbon_tau_ipassive)
+     CALL getin_p('FLUX_TOT_COEFF',flux_tot_coeff)
+
   DO i=1,itau_len
      iatt = iatt+1
      IF (iatt > nparan) iatt = 1
-
-!!$     DS : calling the new_values of soilcarbon parameters
-     !
-     CALL getin('FRAC_CARB_AA',frac_carb_aa)
-     CALL getin('FRAC_CARB_AP',frac_carb_ap)   
-     CALL getin('FRAC_CARB_SS',frac_carb_ss)
-     CALL getin('FRAC_CARB_SA',frac_carb_sa)
-     CALL getin('FRAC_CARB_SP',frac_carb_sp)
-     CALL getin('FRAC_CARB_PP',frac_carb_pp)
-     CALL getin('FRAC_CARB_PA',frac_carb_pa)
-     CALL getin('FRAC_CARB_PS',frac_carb_ps)
-     !
-     CALL getin('ACTIVE_TO_PASS_CLAY_FRAC',active_to_pass_clay_frac)
-     CALL getin('CARBON_TAU_IACTIVE',carbon_tau_iactive)
-     CALL getin('CARBON_TAU_ISLOW',carbon_tau_islow)
-     CALL getin('CARBON_TAU_IPASSIVE',carbon_tau_ipassive)
-     CALL getin('FLUX_TOT_COEFF',flux_tot_coeff)
-
      CALL soilcarbon &
           &    (nbp_loc, dt_forcesoil, clay_loc, &

branches/ORCHIDEE_EXT/ORCHIDEE_OL/getprec.f90

@@ -1 @@
-!  $Header: /home/ssipsl/CVSREP/ORCHIDEE_OL/getprec.f90,v 1.3 2006/09/14 22:53:13 ssipsl Exp $
+!< $HeadURL: http://forge.ipsl.jussieu.fr/orchidee/svn/trunk/ORCHIDEE_OL/getprec.f90 $ 
+!< $Date: 2010-11-29 12:12:17 +0100 (Mon, 29 Nov 2010) $
+!< $Author: mmaipsl $
+!< $Revision: 18 $
 !-
 PROGRAM getprec

branches/ORCHIDEE_EXT/ORCHIDEE_OL/readdim2.f90

@@ -2 +2 @@
 MODULE readdim2
 !---------------------------------------------------------------------
-!- $Header: /home/ssipsl/CVSREP/ORCHIDEE_OL/readdim2.f90,v 1.23 2010/04/22 13:11:24 ssipsl Exp $
+!< $HeadURL: http://forge.ipsl.jussieu.fr/orchidee/svn/trunk/ORCHIDEE_OL/readdim2.f90 $ 
+!< $Date: 2011-01-01 21:42:53 +0100 (Sat, 01 Jan 2011) $
+!< $Author: mmaipsl $
+!< $Revision: 50 $
 !- IPSL (2006)
 !-  This software is governed by the CeCILL licence see ORCHIDEE/ORCHIDEE_CeCILL.LIC
@@ -96 +99 @@
     ALLOCATE(lev_full(llm_full))
     ALLOCATE(fcontfrac(iim_full,jjm_full))
-    ALLOCATE(i_index(iim_full), j_index(jjm_full),j_index_g(jjm_full))
     !-
     lev_full(:) = zero
@@ -249 +251 @@
        !- If we use temporal interpolation, then we cannot change the resolution (yet?)
        !-
+       ALLOCATE(i_index(iim_full), j_index(jjm_full),j_index_g(jjm_full))
        IF (is_root_prc) THEN
 
@@ -362 +365 @@
           CALL weathgen_init &
                &        (filename,dt_force,force_id,iim_zoom,jjm_zoom, &
-               &         zonal_res,merid_res,lon,lat,index_l,NbPoint,&
-               &         i_index,j_index_g)
+               &         zonal_res,merid_res,lon,lat,index_l,NbPoint)
+!!$,&
+!!$               &         i_index,j_index_g)
        ELSE
           ALLOCATE(index_l(1))
@@ -377 +381 @@
        DEALLOCATE(index_l)
 
-       CALL bcast(i_index)
-       CALL bcast(j_index_g)
-
-       ind=0
-       DO j=1,jjm_zoom
-          IF ( (j >= jj_begin) .AND. (j <= jj_end) ) THEN
-             ind=ind+1
-             j_index(ind)=j_index_g(j)
-          ENDIF
-       ENDDO
+!!$       CALL bcast(i_index)
+!!$       CALL bcast(j_index_g)
+
+!!$       ind=0
+!!$       DO j=1,jjm_zoom
+!!$          IF ( (j >= jj_begin) .AND. (j <= jj_end) ) THEN
+!!$             ind=ind+1
+!!$             j_index(ind)=j_index_g(j)
+!!$          ENDIF
+!!$       ENDDO
 
        jjm_zoom=jj_nb
@@ -492 +496 @@
    REAL,DIMENSION(iim,jjm) :: &
   &  SWnet, Eair, petAcoef, peqAcoef, petBcoef, peqBcoef, cdrag, ccanopy
-   INTEGER,DIMENSION(iim*jjm), INTENT(OUT) :: kindex
+   INTEGER,DIMENSION(iim*jjm), INTENT(INOUT) :: kindex
 !-
    INTEGER :: ik,i,j
@@ -688 +692 @@
    ENDIF
 !-
-   itau_read = itauin
+!!$   itau_read = itauin
+   itau_read = MOD((itauin-1),ttm)+1
 !-
 !- This part initializes the reading of the forcing. As you can see

branches/ORCHIDEE_EXT/ORCHIDEE_OL/teststomate.f90

@@ -466 +466 @@
   hist_days_stom = 10.
   CALL getin ('STOMATE_HIST_DT', hist_days_stom)
-  hist_dt_stom = NINT( hist_days_stom ) * one_day
-  WRITE(*,*) 'output frequency for STOMATE history file (d): ', &
+  IF ( hist_days_stom == -1. ) THEN
+     hist_dt_stom = -1.
+     WRITE(numout,*) 'output frequency for STOMATE history file (d): one month.'
+  ELSE
+     hist_dt_stom = NINT( hist_days_stom ) * one_day
+     WRITE(numout,*) 'output frequency for STOMATE history file (d): ', &
              hist_dt_stom/one_day
+  ENDIF
 !-
 ! initialize

branches/ORCHIDEE_EXT/ORCHIDEE_OL/weather.f90

@@ -1474 +1474 @@
 SUBROUTINE weathgen_init &
      & (filename,dt_force,force_id,iim,jjm, &
-     &  zonal_res,merid_res,lon,lat,kindex,nbindex,iind,jind)
+     &  zonal_res,merid_res,lon,lat,kindex,nbindex)
+!!$,iind,jind)
   !---------------------------------------------------------------------
   IMPLICIT NONE
@@ -1480 +1481 @@
   CHARACTER(LEN=*),INTENT(IN)         :: filename
   REAL,INTENT(IN)                     :: dt_force
-  INTEGER,INTENT(IN)                  :: force_id
+  INTEGER,INTENT(INOUT)                  :: force_id
   INTEGER,INTENT(IN)                  :: iim, jjm
   REAL,INTENT(IN)                     :: zonal_res,merid_res
@@ -1487 +1488 @@
   INTEGER,DIMENSION(iim*jjm),INTENT(OUT)  :: kindex
   INTEGER,INTENT(OUT)                     :: nbindex
-  INTEGER,DIMENSION(iim),INTENT(OUT) :: iind
-  INTEGER,DIMENSION(jjm),INTENT(OUT) :: jind
+!!$  INTEGER,DIMENSION(iim),INTENT(OUT) :: iind
+!!$  INTEGER,DIMENSION(jjm),INTENT(OUT) :: jind
   !-
   REAL,PARAMETER  :: fcrit = .5