Changeset 1124 for LMDZ4/branches/LMDZ4_V3_patches/libf

Timestamp:

Mar 17, 2009, 10:53:39 AM (16 years ago)

Author:

jghattas

Message:

Modification pour couplage conservatif avec NEMO : passage des champs totaux et champs sur la glace au lieu de passage des champs sur l'ocean et champs sur la glace.

Arnaud Caubel

Location:

LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd

Files:

• cpl_mod.F90 (modified) (4 diffs)
• oasis.F90 (modified) (1 diff)

LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/cpl_mod.F90

@@ -954 +954 @@
     tab_flds(:,:,7)  = cpl_windsp2D(:,:)
     tab_flds(:,:,8)  = cpl_sols2D(:,:,2)
-    tab_flds(:,:,9)  = cpl_sols2D(:,:,1)
     tab_flds(:,:,10) = cpl_nsol2D(:,:,2)
-    tab_flds(:,:,11) = cpl_nsol2D(:,:,1)
     tab_flds(:,:,12) = cpl_fder2D(:,:,2)
     
@@ -962 +960 @@
        tab_flds(:,:,18) = cpl_rriv2D(:,:) + cpl_rcoa2D(:,:)
     ELSE IF (version_ocean=='opa8') THEN
+       tab_flds(:,:,9)  = cpl_sols2D(:,:,1)
+       tab_flds(:,:,11) = cpl_nsol2D(:,:,1)
+
        tab_flds(:,:,13) = cpl_evap2D(:,:,2)
        tab_flds(:,:,14) = cpl_evap2D(:,:,1)
@@ -1030 +1031 @@
 
     IF (version_ocean=='nemo') THEN
-       tab_flds(:,:,13) = cpl_evap2D(:,:,2) - (cpl_rain2D(:,:,2) + cpl_snow2D(:,:,2))
-
+
+       tab_flds(:,:,9)  = 0.0
+       tab_flds(:,:,11) = 0.0
+       tab_flds(:,:,13) = 0.0
        tab_flds(:,:,14) = 0.0
+       tab_flds(:,:,15) = 0.0
        tmp_taux(:,:)    = 0.0
        tmp_tauy(:,:)    = 0.0
+       
        ! For all valid grid cells containing some fraction of ocean or sea-ice
        WHERE ( deno(:,:) /= 0 )
@@ -1041 +1046 @@
            tmp_tauy = cpl_tauy2D(:,:,1) * pctsrf2D(:,:,is_oce) / deno(:,:) +    &
               cpl_tauy2D(:,:,2) * pctsrf2D(:,:,is_sic) / deno(:,:)
+           tab_flds(:,:,9) = cpl_sols2D(:,:,1) * pctsrf2D(:,:,is_oce) / deno(:,:) +    &
+              cpl_sols2D(:,:,2) * pctsrf2D(:,:,is_sic) / deno(:,:)
+           tab_flds(:,:,11) = cpl_nsol2D(:,:,1) * pctsrf2D(:,:,is_oce) / deno(:,:) +    &
+              cpl_nsol2D(:,:,2) * pctsrf2D(:,:,is_sic) / deno(:,:)
+           tab_flds(:,:,13) = cpl_rain2D(:,:,1) * pctsrf2D(:,:,is_oce) / deno(:,:) +    &
+               cpl_rain2D(:,:,2) * pctsrf2D(:,:,is_sic) / deno(:,:)
            tab_flds(:,:,14) = cpl_snow2D(:,:,1) * pctsrf2D(:,:,is_oce) / deno(:,:) +    &
               cpl_snow2D(:,:,2) * pctsrf2D(:,:,is_sic) / deno(:,:)
+           tab_flds(:,:,15) = cpl_evap2D(:,:,1) * pctsrf2D(:,:,is_oce) / deno(:,:) +    &
+              cpl_evap2D(:,:,2)  * pctsrf2D(:,:,is_sic) / deno(:,:)
        ENDWHERE
 
-       WHERE (pctsrf2D(:,:,is_sic) == 0)
-          cpl_evap2D(:,:,2) = 0.0
-       END WHERE
-
-       tab_flds(:,:,14) = cpl_evap2D(:,:,2) - tab_flds(:,:,14)
-       tab_flds(:,:,15) = cpl_evap2D(:,:,1) - (cpl_rain2D(:,:,1) + cpl_snow2D(:,:,1))
        tab_flds(:,:,16) = cpl_evap2D(:,:,2) 
 

LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/oasis.F90

@@ -140 +140 @@
     cl_writ(7)='COWINDSP'
     cl_writ(8)='COSHFICE'
-    cl_writ(9)='COSHFOCE'
     cl_writ(10)='CONSFICE'
-    cl_writ(11)='CONSFOCE'
     cl_writ(12)='CODFLXDT'
 
     IF (version_ocean=='nemo') THEN
-      cl_writ(13)='COEMPSIC'
-      cl_writ(14)='CONESOPR'
-      cl_writ(15)='COEMPOCE'
+      cl_writ(9)='COQSRMIX'
+      cl_writ(11)='COQNSMIX'
+      cl_writ(13)='COTOTRAI'
+      cl_writ(14)='COTOTSNO'
+      cl_writ(15)='COTOTEVA'
       cl_writ(16)='COICEVAP'
       cl_writ(17)='COCALVIN'
       cl_writ(18)='COLIQRUN'
     ELSE IF (version_ocean=='opa8') THEN
+       cl_writ(9)='COSHFOCE'
+       cl_writ(11)='CONSFOCE'
        cl_writ(13)='COTFSICE'
        cl_writ(14)='COTFSOCE'