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

Timestamp:

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

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2186:2216 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/phyredem.F90 (modified) (4 diffs)

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

@@ -16 +16 @@
   USE indice_sol_mod
   USE surface_data
-  USE ocean_slab_mod, ONLY : tslab
+  USE ocean_slab_mod, ONLY : tslab, seaice, tice, fsic
 
   IMPLICIT none
@@ -107 +107 @@
   ! BP ajout des fraction de chaque sous-surface
 
+  ! Get last fractions from slab ocean
+  IF (type_ocean == 'slab' .AND. version_ocean == "sicINT") THEN
+      WHERE (1.-zmasq(:).GT.EPSFRA)
+          pctsrf(:,is_oce)=(1.-fsic(:))*(1.-zmasq(:))
+          pctsrf(:,is_sic)=fsic(:)*(1.-zmasq(:))
+      END WHERE
+  END IF
+
   ! 1. fraction de terre 
 
@@ -209 +217 @@
 
   CALL put_field("sollw", "Rayonnement IF a la surface", sollw)
+
+  CALL put_field("sollwdown", "Rayonnement down IF a la surface", sollw)
 
   CALL put_field("fder", "Derive de flux", fder)
@@ -350 +360 @@
   IF (type_ocean == 'slab') THEN
       CALL put_field("tslab", "Slab ocean temperature", tslab)
+      IF (version_ocean == 'sicINT') THEN
+          CALL put_field("seaice", "Slab seaice (kg/m2)", seaice)
+          CALL put_field("slab_tice", "Slab sea ice temperature", tice)
+      END IF
   END IF