Changeset 275

Timestamp:

Sep 20, 2001, 12:44:47 PM (23 years ago)

Author:

lmdzadmin

Message:

Prise en compte du runoff et changement de signe de l'evap sortie
d'orchidee
LF

File:

• LMDZ.3.3/branches/rel-LF/libf/phylmd/interface_surf.F90 (modified) (5 diffs)

LMDZ.3.3/branches/rel-LF/libf/phylmd/interface_surf.F90

@@ -262 +262 @@
       allocate(run_off(knon), stat = error)
       if (error /= 0) then
-        abort_message='Pb allocation runoff'
+        abort_message='Pb allocation run_off'
         call abort_gcm(modname,abort_message,1)
       endif
@@ -270 +270 @@
       abort_message='voir ci-dessus'
       call abort_gcm(modname,abort_message,1)
-      deallocate(coastalflow, stat = error)
-      allocate(coastalflow(knon), stat = error)
-      if (error /= 0) then
-        abort_message='Pb allocation coastalflow'
-        call abort_gcm(modname,abort_message,1)
-      endif
-      deallocate(riverflow, stat = error)
-      allocate(riverflow(knon), stat = error)
-      if (error /= 0) then
-        abort_message='Pb allocation riverflow'
-        call abort_gcm(modname,abort_message,1)
-      endif
-      deallocate(run_off, stat = error)
-      allocate(run_off(knon), stat = error)
-      if (error /= 0) then
-        abort_message='Pb allocation run_off'
-        call abort_gcm(modname,abort_message,1)
-      endif
-    endif
-    run_off = 0.
+    endif
+    coastalflow = 0.
+    riverflow = 0.
 !
 ! Calcul age de la neige
@@ -970 +953 @@
   alb_new(:) = albedo_out(:,1)
 
-! LF essai sensible
+! Convention orchidee: positif vers le haut
   fluxsens = -1. * fluxsens
   fluxlat  = -1. * fluxlat
+  evap     = -1. * evap
 
   if (debut) lrestart_read = .false.
@@ -1253 +1237 @@
        &                          + tauy(ig)        / FLOAT(nexca)
       cpl_rriv(ig,cpl_index) = cpl_rriv(ig,cpl_index) &
-       &                          + 0.     / FLOAT(nexca)/dtime
+       &                          + riverflow      / FLOAT(nexca)/dtime
       cpl_rcoa(ig,cpl_index) = cpl_rcoa(ig,cpl_index) &
-       &                          + 0.     / FLOAT(nexca)/dtime
+       &                          + coastalflow    / FLOAT(nexca)/dtime
     enddo
   endif
@@ -2012 +1996 @@
   if (check) write(*,*)'Entree ', modname,' surface = ',nisurf
 
-  if (size(run_off) /= knon .AND. nisurf == is_ter) then
+  if (size(coastalflow) /= knon .AND. nisurf == is_ter) then
     write(*,*)'Bizarre, le nombre de points continentaux'
     write(*,*)'a change entre deux appels. J''arrete ...'