Changeset 5971 for LMDZ6/trunk/libf

Timestamp:

Dec 19, 2025, 1:16:12 PM (5 weeks ago)

Author:

yann meurdesoif

Message:

gpu port of surf_land
merge of commit r5914
YM

Location:

LMDZ6/trunk/libf/phylmd

Files:

• calbeta_clim.f90 (modified) (2 diffs)
• surf_land_bucket_hetero_mod.F90 (modified) (1 diff)
• surf_land_bucket_mod.F90 (modified) (5 diffs)
• surface_data.f90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmd/calbeta_clim.f90

@@ -3 +3 @@
 ! fairhead Exp $
 !
+MODULE calbeta_clim_mod
+
+
+CONTAINS
 
 SUBROUTINE calbeta_clim(klon,time,lat_radian,beta)
+!$gpum horizontal klon
 
   !======================================================================
@@ -71 +76 @@
 
 end SUBROUTINE calbeta_clim
+
+END MODULE calbeta_clim_mod

LMDZ6/trunk/libf/phylmd/surf_land_bucket_hetero_mod.F90

@@ -43 +43 @@
     USE albsno_mod, ONLY :  albsno
     USE calbeta_mod, ONLY :  calbeta
+    USE calbeta_clim_mod, ONLY :  calbeta_clim
 
 #ifdef ISO

LMDZ6/trunk/libf/phylmd/surf_land_bucket_mod.F90

@@ -23 +23 @@
 #endif           
             )
-
+!$gpum horizontal knon klon
     USE limit_read_mod
     USE surface_data
@@ -50 +50 @@
     USE soil_mod, ONLY :  soil
     USE calbeta_mod, ONLY :  calbeta
+    USE calbeta_clim_mod, ONLY :  calbeta_clim
+
 
 !****************************************************************************************
@@ -125 +127 @@
     REAL :: coeff_rel_diag
 #endif 
+    REAL :: lat(knon), lon(knon)
+
 !
 !****************************************************************************************
@@ -169 +173 @@
     CALL calbeta(dtime, is_ter, knon, snow, qsol, beta, capsol, dif_grnd)
     if (type_veget=='betaclim') then
-       CALL calbeta_clim(knon,jour,latitude(knindex(1:knon)),beta)
+       lat(1:knon) = latitude(knindex(1:knon))
+       CALL calbeta_clim(knon,jour,lat ,beta)
     endif
        
 ! calculate temperature, heat capacity and conduction flux in soil
     IF (soil_model) THEN
+       lat(1:knon) = latitude(knindex(1:knon))
+       lon(1:knon) = longitude(knindex(1:knon))
        CALL soil(dtime, is_ter, knon, snow, tsurf, qsol,  & 
-        & longitude(knindex(1:knon)), latitude(knindex(1:knon)), tsoil, soilcap, soilflux)
+        & lon, lat, tsoil, soilcap, soilflux)
 
        DO i=1, knon
@@ -337 +344 @@
        dummy_riverflow(:)   = 0.0
        dummy_coastalflow(:) = 0.0
+!$gpum nocall
        CALL cpl_send_land_fields(itime, knon, knindex, &
             dummy_riverflow, dummy_coastalflow)

LMDZ6/trunk/libf/phylmd/surface_data.f90

@@ -12 +12 @@
   !$OMP THREADPRIVATE(ok_veget)
 
-  CHARACTER(len=10), SAVE :: type_veget   ! orchidee/y/bucket/n/betaclim
+  CHARACTER(len=s2s_str_maxlen), SAVE :: type_veget   ! orchidee/y/bucket/n/betaclim
   !$OMP THREADPRIVATE(type_veget)