Changeset 2220 for LMDZ5/branches/testing/libf/phylmd/change_srf_frac_mod.F90

Timestamp:

Mar 3, 2015, 2:41:13 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2186:2216 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/change_srf_frac_mod.F90 (modified) (2 diffs)

LMDZ5/branches/testing/libf/phylmd/change_srf_frac_mod.F90

@@ -23 +23 @@
 
     USE dimphy 
-    USE surface_data, ONLY : type_ocean
+    USE surface_data, ONLY : type_ocean,version_ocean
     USE limit_read_mod
     USE pbl_surface_mod, ONLY : pbl_surface_newfrac
     USE cpl_mod, ONLY : cpl_receive_frac
-    USE ocean_slab_mod, ONLY : ocean_slab_frac
+    USE ocean_slab_mod, ONLY : fsic, ocean_slab_frac
     USE indice_sol_mod
 
@@ -146 +146 @@
           pctsrf(:,is_sic) = 0.
        END WHERE
+! Send fractions back to slab ocean if needed
+       IF (type_ocean == 'slab'.AND. version_ocean.NE.'sicINT') THEN
+           WHERE (1.-zmasq(:)>EPSFRA)
+               fsic(:)=pctsrf(:,is_sic)/(1.-zmasq(:))
+           END WHERE
+       END IF
 
 !****************************************************************************************