Changeset 177 for LMDZ.3.3/branches/rel-LF/libf/phylmd/oasis.true

Timestamp:

Mar 9, 2001, 4:36:10 PM (23 years ago)

Author:

lmdzadmin

Message:

Lots of stuff, plus particulierement:

• appel a ORCHIDEE en etat de marche (pb de grille subsiste)
• modifs de Pascale sur soil dans le cas ou ok_veget=false -

File:

• LMDZ.3.3/branches/rel-LF/libf/phylmd/oasis.true (modified) (7 diffs)

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

@@ -80 +80 @@
       cl_writ(10)='CORUNCOA'
       cl_writ(11)='CORIVFLU'
-      cl_writ(12)='COZOTAUX'
-      cl_writ(13)='COZOTAUV'
-      cl_writ(14)='COMETAUY'
-      cl_writ(15)='COMETAUU'
+c$$$      cl_writ(12)='COZOTAUX'
+c$$$      cl_writ(13)='COZOTAUV'
+c$$$      cl_writ(14)='COMETAUY'
+c$$$      cl_writ(15)='COMETAUU'
+      cl_writ(12)='COTAUXXU'
+      cl_writ(13)='COTAUYYU'
+      cl_writ(14)='COTAUZZU'
+      cl_writ(15)='COTAUXXV'
+      cl_writ(16)='COTAUYYV'
+      cl_writ(17)='COTAUZZV'
 c
 c     Define files name for fields exchanged from atmos to coupler,
@@ -103 +109 @@
       cl_f_writ(14)='flxatmos'
       cl_f_writ(15)='flxatmos'
-c      cl_f_writ(16)='flxatmos'
+      cl_f_writ(16)='flxatmos'
+      cl_f_writ(17)='flxatmos'
+
 c
 c
@@ -294 +302 @@
       SUBROUTINE intocpl(kt, imjm, fsolice, fsolwat, fnsolice, fnsolwat,
      $    fnsicedt, evice, evwat, lpre, spre, dirunoff, rivrunoff,
-     $    tauxu, tauxv, tauyv, tauyu, last) 
+     $    tauxx_u, tauyy_u, tauzz_u, tauxx_v, tauyy_v, tauzz_v,last) 
 c ======================================================================
 c S. Valcke (02/99) adapted From L.Z.X Li: this subroutine provides the 
@@ -306 +314 @@
       REAL fsolice(imjm)
       REAL fsolwat(imjm)
-      REAL fnsolice(imjm)
       REAL fnsolwat(imjm)
-      REAL fnsicedt(imjm)
-      REAL ictemp(imjm)
+      REAL fnsolice(imjm) 
+      REAL fnsicedt(imjm) 
       REAL evice(imjm)
       REAL evwat(imjm)
@@ -316 +323 @@
       REAL dirunoff(imjm)
       REAL rivrunoff(imjm)
-      REAL tauxu(imjm)
-      REAL tauxv(imjm)
-      REAL tauyu(imjm)
-      REAL tauyv(imjm)
+c$$$      REAL tauxu(imjm)
+c$$$      REAL tauxv(imjm)
+c$$$      REAL tauyu(imjm)
+c$$$      REAL tauyv(imjm)
+      REAL tauxx_u(imjm)
+      REAL tauxx_v(imjm)
+      REAL tauyy_u(imjm)
+      REAL tauyy_v(imjm)
+      REAL tauzz_u(imjm)
+      REAL tauzz_v(imjm)
       LOGICAL last
 c
@@ -431 +444 @@
      $          CALL locwrite(cl_writ(jf),rivrunoff, imjm,
      $          file_unit_field(jf), ierror, nuout) 
+c$$$            IF (jf.eq.12)
+c$$$     $          CALL locwrite(cl_writ(jf),tauxu, imjm,
+c$$$     $          file_unit_field(jf),ierror, nuout) 
+c$$$            IF (jf.eq.13)
+c$$$     $          CALL locwrite(cl_writ(jf),tauxv, imjm,
+c$$$     $          file_unit_field(jf),ierror, nuout) 
+c$$$            IF (jf.eq.14)
+c$$$     $          CALL locwrite(cl_writ(jf),tauyv, imjm,
+c$$$     $          file_unit_field(jf),ierror, nuout) 
+c$$$            IF (jf.eq.15)
+c$$$     $          CALL locwrite(cl_writ(jf),tauyu, imjm,
+c$$$     $          file_unit_field(jf), ierror, nuout) 
             IF (jf.eq.12)
-     $          CALL locwrite(cl_writ(jf),tauxu, imjm,
-     $          file_unit_field(jf),ierror, nuout) 
+     $          CALL locwrite(cl_writ(jf),tauxx_u, imjm,
+     $          file_unit_field(jf),ierror)
             IF (jf.eq.13)
-     $          CALL locwrite(cl_writ(jf),tauxv, imjm,
-     $          file_unit_field(jf),ierror, nuout) 
+     $          CALL locwrite(cl_writ(jf),tauyy_u, imjm,
+     $          file_unit_field(jf),ierror)
             IF (jf.eq.14)
-     $          CALL locwrite(cl_writ(jf),tauyv, imjm,
-     $          file_unit_field(jf),ierror, nuout) 
+     $          CALL locwrite(cl_writ(jf),tauzz_u, imjm,
+     $          file_unit_field(jf),ierror)
             IF (jf.eq.15)
-     $          CALL locwrite(cl_writ(jf),tauyu, imjm,
-     $          file_unit_field(jf), ierror, nuout) 
+     $          CALL locwrite(cl_writ(jf),tauxx_v, imjm,
+     $          file_unit_field(jf),ierror)
+            IF (jf.eq.16)
+     $          CALL locwrite(cl_writ(jf),tauyy_v, imjm,
+     $          file_unit_field(jf),ierror)
+            IF (jf.eq.17)
+     $          CALL locwrite(cl_writ(jf),tauzz_v, imjm,
+     $          file_unit_field(jf),ierror)
           END DO 
 C
@@ -484 +515 @@
           IF (jn.eq.10) CALL CLIM_Export(cl_writ(jn),kt,dirunoff, info)
           IF (jn.eq.11) CALL CLIM_Export(cl_writ(jn),kt,rivrunoff,info)
-          IF (jn.eq.12) CALL CLIM_Export(cl_writ(jn), kt, tauxu, info)
-          IF (jn.eq.13) CALL CLIM_Export(cl_writ(jn), kt, tauxv, info)
-          IF (jn.eq.14) CALL CLIM_Export(cl_writ(jn), kt, tauyv, info)
-          IF (jn.eq.15) CALL CLIM_Export(cl_writ(jn), kt, tauyu, info)
+c$$$          IF (jn.eq.12) CALL CLIM_Export(cl_writ(jn), kt, tauxu, info)
+c$$$          IF (jn.eq.13) CALL CLIM_Export(cl_writ(jn), kt, tauxv, info)
+c$$$          IF (jn.eq.14) CALL CLIM_Export(cl_writ(jn), kt, tauyv, info)
+c$$$          IF (jn.eq.15) CALL CLIM_Export(cl_writ(jn), kt, tauyu, info)
+          IF (jn.eq.12) CALL CLIM_Export(cl_writ(jn), kt, tauxx_u, info)
+          IF (jn.eq.13) CALL CLIM_Export(cl_writ(jn), kt, tauyy_u, info)
+          IF (jn.eq.14) CALL CLIM_Export(cl_writ(jn), kt, tauzz_u, info)
+          IF (jn.eq.15) CALL CLIM_Export(cl_writ(jn), kt, tauxx_v, info)
+          IF (jn.eq.16) CALL CLIM_Export(cl_writ(jn), kt, tauyy_v, info)
+          IF (jn.eq.17) CALL CLIM_Export(cl_writ(jn), kt, tauzz_v, info)
           
             IF (info .NE. CLIM_Ok) THEN