Changeset 257 for branches/ORCHIDEE_EXT/ORCHIDEE/src_global

Timestamp:

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

Author:

didier.solyga

Message:

Externalized version merged with the trunk

Location:

branches/ORCHIDEE_EXT/ORCHIDEE/src_global

Files:

• AA_make (modified) (3 diffs)
• AA_make.ldef (modified) (1 diff)
• grid.f90 (modified) (4 diffs)
• interpol_help.f90 (modified) (1 diff)
• solar.f90 (modified) (3 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE/src_global/AA_make

@@ -1 +1 @@
 #-
-#- $Id: AA_make,v 1.5 2010/04/06 14:26:07 ssipsl Exp $
+#- $Id: AA_make 41 2011-01-01 19:56:53Z mmaipsl $
 #-
 PARAM_LIB = $(LIBDIR)/libparameters.a
@@ -21 +21 @@
 #-
 all:
+        $(M_K) libparallel
         $(M_K) libparameters
         $(M_K) m_all
@@ -26 +27 @@
 
 m_all: $(MODEL_LIB)($(OBJSMODS1))
+
+libparallel:
+        (cd ../src_parallel; $(M_K) -f Makefile)
 
 libparameters:

branches/ORCHIDEE_EXT/ORCHIDEE/src_global/AA_make.ldef

@@ -1 +1 @@
 #-
-#- $Id: AA_make.ldef,v 1.2 2008/01/08 11:49:07 ssipsl Exp $
+#- $Id: AA_make.ldef 12 2010-11-05 15:42:13Z mmaipsl $
 #-
 #---------------------------------------------------------------------

branches/ORCHIDEE_EXT/ORCHIDEE/src_global/grid.f90

@@ -4 +4 @@
 !! @call sechiba_main
 !! @Version : $Revision: 1.8 $, $Date: 2009/01/28 08:32:45 $
+!! @Version : $Revision: 42 $, $Date: 2011-01-01 21:15:03 +0100 (Sat, 01 Jan 2011) $
 !! 
 !! $Header: /home/ssipsl/CVSREP/ORCHIDEE/src_global/grid.f90,v 1.8 2009/01/28 08:32:45 ssipsl Exp $
+!< $HeadURL: http://forge.ipsl.jussieu.fr/orchidee/svn/trunk/ORCHIDEE/src_global/grid.f90 $
+!< $Date: 2011-01-01 21:15:03 +0100 (Sat, 01 Jan 2011) $
+!< $Author: mmaipsl $
+!< $Revision: 42 $
 !!
 !! @author Marie-Alice Foujols, Jan Polcher and Martial Mancip
@@ -23 +28 @@
   ! default resolution (m)
   REAL(r_std), PARAMETER :: default_resolution = 250000.
-  !
   !
   ! VARIABLES
@@ -189 +193 @@
     ! =========================================================================
     
-
-
     IF ( bavard .GE. 4 ) WRITE(numout,*) 'Entering grid_stuff'
 
@@ -239 +241 @@
        ! initialize output
        neighbours_g(:,:) = -1
-       resolution_g(:,:) = 0.
+       resolution_g(:,:) = zero
        min_resol(:) = 1.e6
-       max_resol(:) = -1.
+       max_resol(:) = moins_un
        
        correspondance(:,:) = -1

branches/ORCHIDEE_EXT/ORCHIDEE/src_global/interpol_help.f90

@@ -8 +8 @@
 !
 !! $Header: /home/ssipsl/CVSREP/ORCHIDEE/src_global/interpol_help.f90,v 1.7 2010/04/06 14:30:23 ssipsl Exp $
+!
+!< $HeadURL: http://forge.ipsl.jussieu.fr/orchidee/svn/trunk/ORCHIDEE/src_global/interpol_help.f90 $
+!< $Date: 2011-01-01 20:56:53 +0100 (Sat, 01 Jan 2011) $
+!< $Author: mmaipsl $
+!< $Revision: 41 $
 !
 !

branches/ORCHIDEE_EXT/ORCHIDEE/src_global/solar.f90

@@ -3 +3 @@
 !! @call sechiba_main
 !! @Version : $Revision: 1.1 $, $Date: 2010/04/06 14:26:07 $
+!! @Version : $Revision: 42 $, $Date: 2011-01-01 21:15:03 +0100 (Sat, 01 Jan 2011) $
 !! 
 !! $Header: /home/ssipsl/CVSREP/ORCHIDEE/src_global/solar.f90,v 1.1 2010/04/06 14:26:07 ssipsl Exp $
+!
+!< $HeadURL: http://forge.ipsl.jussieu.fr/orchidee/svn/trunk/ORCHIDEE/src_global/solar.f90 $
+!< $Date: 2011-01-01 21:15:03 +0100 (Sat, 01 Jan 2011) $
+!< $Author: mmaipsl $
+!< $Revision: 42 $
 !!
 !! @author Marie-Alice Foujols, Jan Polcher and Martial Mancip
@@ -54 +60 @@
     !---------------------------------------------------------------------
     !
-!    pi = 4.*ATAN(1.)
     IF (check) WRITE(numout,*) 'We get the right calendar information'
     !-
@@ -132 +137 @@
           llat  = llatd*pi/180.
           csang(ilon,ilat) = &
-               &  MAX(0.,SIN(dec)*SIN(llat)+COS(dec)*COS(llat)*COS(omega))
+               &  MAX(zero,SIN(dec)*SIN(llat)+COS(dec)*COS(llat)*COS(omega))
        ENDDO
     ENDDO