Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/surf_ocean_mod.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/surf_ocean_mod.F90 (modified) (3 diffs)

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

@@ -20 +20 @@
        flux_u1, flux_v1)
 
-  USE dimphy
+  use albedo, only: alboc, alboc_cd
+  USE dimphy, ONLY: klon, zmasq
   USE surface_data, ONLY     : type_ocean
   USE ocean_forced_mod, ONLY : ocean_forced_noice
   USE ocean_slab_mod, ONLY   : ocean_slab_noice
   USE ocean_cpl_mod, ONLY    : ocean_cpl_noice
-  USE indice_sol_mod
+  USE indice_sol_mod, ONLY : nbsrf, is_oce
 !
 ! This subroutine will make a call to ocean_XXX_noice according to the ocean mode (force, 
@@ -91 +92 @@
     REAL, DIMENSION(klon) :: radsol
     REAL, DIMENSION(klon) :: cdragq ! Cdrag pour l'evaporation
+    CHARACTER(len=20),PARAMETER :: modname="surf_ocean"
 
 ! End definition
@@ -216 +218 @@
     ENDDO
 ELSE
-       STOP'version non prevue'
+       CALL abort_physic(modname,'version non prevue',1)
 ENDIF
 !