Changeset 3975 for LMDZ6/trunk/libf/phylmdiso

Timestamp:

Aug 6, 2021, 3:12:49 PM (3 years ago)

Author:

fhourdin

Message:

Correction de l'appel a "soil" dans la version isotopique
suite à une modification de cette routine dans phhylmd.

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• ocean_forced_mod.F90 (modified) (2 diffs)
• surf_land_bucket_mod.F90 (modified) (2 diffs)
• surf_landice_mod.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/phylmdiso/ocean_forced_mod.F90

@@ -262 +262 @@
 !
     USE dimphy
+    USE geometry_mod, ONLY: longitude,latitude
+
     USE calcul_fluxs_mod
     USE surface_data,     ONLY : calice, calsno
@@ -379 +381 @@
     IF (soil_model) THEN 
 ! update tsoil and calculate soilcap and soilflux
-       CALL soil(dtime, is_sic, knon, snow, tsurf_tmp, tsoil,soilcap, soilflux)
+       CALL soil(dtime, is_sic, knon, snow, tsurf_tmp, qsol, &
+        & longitude(knindex(1:knon)), latitude(knindex(1:knon)), tsoil,soilcap, soilflux)
+
        cal(1:knon) = RCPD / soilcap(1:knon)
        radsol(1:knon) = radsol(1:knon)  + soilflux(1:knon)

LMDZ6/trunk/libf/phylmdiso/surf_land_bucket_mod.F90

@@ -30 +30 @@
     USE cpl_mod
     USE dimphy
-    USE geometry_mod, ONLY: latitude 
+    USE geometry_mod, ONLY: longitude,latitude 
     USE mod_grid_phy_lmdz
     USE mod_phys_lmdz_para
@@ -176 +176 @@
     IF (soil_model) THEN 
 !       write(*,*) 'surf_land_bucket 185'
-       CALL soil(dtime, is_ter, knon, snow, tsurf, tsoil, soilcap, soilflux)
+       CALL soil(dtime, is_ter, knon, snow, tsurf, qsol,  &
+      & longitude(knindex(1:knon)), latitude(knindex(1:knon)), tsoil, soilcap, soilflux)
+
 !       write(*,*) 'surf_land_bucket 187'
        DO i=1, knon

LMDZ6/trunk/libf/phylmdiso/surf_landice_mod.F90

@@ -44 +44 @@
 #endif
 #endif
+    USE geometry_mod,     ONLY : longitude,latitude
+
 !FC
     USE ioipsl_getin_p_mod, ONLY : getin_p
@@ -53 +55 @@
 
     USE indice_sol_mod
+
 
 !    INCLUDE "indicesol.h"
@@ -337 +340 @@
     ! use soil model and recalculate properly cal
     IF (soil_model) THEN 
-       CALL soil(dtime, is_lic, knon, snow, tsurf, tsoil, soilcap, soilflux)
+       CALL soil(dtime, is_lic, knon, snow, tsurf, qsol, &
+    & longitude(knindex(1:knon)), latitude(knindex(1:knon)), tsoil, soilcap, soilflux)
+
        cal(1:knon) = RCPD / soilcap(1:knon)
        radsol(1:knon)  = radsol(1:knon) + soilflux(1:knon)