Changeset 131 for LMDZ.3.3/branches/rel-LF/libf

Timestamp:

Sep 13, 2000, 3:41:01 PM (24 years ago)

Author:

lmdzadmin

Message:

Divers bugs corriges pour le couplage
LF

Location:

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

Files:

• interface_surf.F90 (modified) (5 diffs)
• oasis.F (modified) (2 diffs)
• oasis.h (modified) (1 diff)

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

@@ -295 +295 @@
 !
     if (ocean == 'couple') then
-      nexca = 0
+!     nexca = 0
       if (nexca == 0) then
         abort_message='nexca = 0 dans interfoce_cpl'
@@ -362 +362 @@
       cal = 0.
       dif_grnd = 0.
+      beta = 1.
 
 !    else if (ocean == 'slab  ') then
@@ -761 +762 @@
   real, allocatable, dimension(:,:),save :: tamp_zmasq
   real, dimension(iim, jjm+1) :: deno
+! 
+  logical, save    :: first_appel = .true.
+  logical          :: check = .true.
 !
 ! Initialisation
 !
-  if (debut) then
+  if (check) write(*,*)'Entree ',modname,'nisurf = ',nisurf
+ 
+  if (first_appel) then
     sum_error = 0
     allocate(cpl_sols(knon,2), stat = error); sum_error = sum_error + error
@@ -780 +786 @@
     allocate(read_sst(iim, jjm+1), stat = error); sum_error = sum_error + error
     allocate(read_sic(iim, jjm+1), stat = error); sum_error = sum_error + error
-    allocate(read_sit(iim, jjm+1), stat = error); sum_error = sum_error + error
     allocate(read_sit(iim, jjm+1), stat = error); sum_error = sum_error + error
     allocate(read_alb_sic(iim, jjm+1), stat = error); sum_error = sum_error + error
@@ -832 +837 @@
     endif
 
-  endif ! fin if (debut)
+    first_appel = .false.
+  endif ! fin if (first_appel)
 
 ! fichier restart et fichiers histoires

LMDZ.3.3/branches/rel-LF/libf/phylmd/oasis.F

@@ -58 +58 @@
 c     Define the model name
 c
-      clmodnam = 'toyatm'       ! as in $NBMODEL in Cpl/Nam/namcouple.tmp
+      clmodnam = 'lmdz.x'       ! as in $NBMODEL in Cpl/Nam/namcouple.tmp
 c
 c     Define the coupler name
@@ -162 +162 @@
 c         Define names of each model as in $NBMODEL line of namcouple
 c         (used for CLIM/MPI2 only)        
-          cmpi_modnam(1)='toyatm'
-          cmpi_modnam(2)='toyoce'
+          cmpi_modnam(1)='lmdz.x'
+          cmpi_modnam(2)='oce.xx'
 c         Start the coupling 
 c

LMDZ.3.3/branches/rel-LF/libf/phylmd/oasis.h

@@ -10 +10 @@
 
       CHARACTER*8 cchan
-      PARAMETER ( cchan='PIPE' )
+      PARAMETER ( cchan='CLIM' )
 C
 C     --- end of oasis.h