Changeset 4526

Timestamp:

May 8, 2023, 2:35:08 PM (13 months ago)

Author:

evignon

Message:

fix bug from merge of blowing snow branch

Location:

LMDZ6/trunk/libf/phylmd

Files:

• surf_land_mod.F90 (modified) (2 diffs)
• surf_land_orchidee_mod.F90 (modified) (3 diffs)
• surf_landice_mod.F90 (modified) (2 diffs)
• surf_ocean_mod.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmd/surf_land_mod.F90

@@ -137 +137 @@
 
 IF (ok_bs) THEN
-precip_totsnow=precip_snow+precip_bs
+precip_totsnow(:)=precip_snow(:)+precip_bs(:)
 ELSE
-precip_totsnow=precip_snow
+precip_totsnow(:)=precip_snow(:)
 ENDIF
 !****************************************************************************************
@@ -180 +180 @@
             precip_rain, precip_totsnow, lwdown_m, swnet, swdown, &
             pref_tmp, q2m, t2m, &
-            evap, fluxsens, fluxlat,fluxbs, &              
+            evap, fluxsens, fluxlat,  &              
             tsol_rad, tsurf_new, alb1_new, alb2_new, &
             emis_new, z0m, z0h, qsurf, &

LMDZ6/trunk/libf/phylmd/surf_land_orchidee_mod.F90

@@ -47 +47 @@
        precip_rain, precip_snow, lwdown, swnet, swdown, &
        ps, q2m, t2m, &
-       evap, fluxsens, fluxlat, fluxbs, &              
+       evap, fluxsens, fluxlat, &              
        tsol_rad, tsurf_new, alb1_new, alb2_new, &
        emis_new, z0m_new, z0h_new, qsurf, &
@@ -140 +140 @@
 ! Parametres de sortie
 !****************************************************************************************
-    REAL, DIMENSION(klon), INTENT(OUT)        :: evap, fluxsens, fluxlat, fluxbs, qsurf
+    REAL, DIMENSION(klon), INTENT(OUT)        :: evap, fluxsens, fluxlat, qsurf
     REAL, DIMENSION(klon), INTENT(OUT)        :: tsol_rad, tsurf_new
     REAL, DIMENSION(klon), INTENT(OUT)        :: alb1_new, alb2_new
@@ -633 +633 @@
     fluxlat(1:knon)  = -1. * fluxlat(1:knon)
    
-! temporary until blowing snow flux is calculated in orchidee
-    fluxbs(:)=0.
-
 !  evap     = -1. * evap
 

LMDZ6/trunk/libf/phylmd/surf_landice_mod.F90

@@ -382 +382 @@
            qsalt=(max(ustar(i)**2-ustart(i)**2,0.))/(RG*hsalt)*esalt
            !ep=qsalt*cdragm(i)*sqrt(u1(i)**2+v1(i)**2)
+           !Pay attention that this is an explicit formulation for the surface flux
+           !Formulation fully consistent with the implicit resolution of the turbulent
+           !mixing scheme remains to be coded
            fluxbs(i)= zeta_bs*p1lay(i)/RD/temp_air(i)*ws1(i)*cdragm(i)*(qbs1(i)-qsalt)
        enddo
@@ -401 +404 @@
 !****************************************************************************************
     IF (ok_bs) THEN
-      precip_totsnow=precip_snow+precip_bs
-      evap_totsnow=evap-fluxbs ! flux bs is positive towards the surface (snow erosion)
+      precip_totsnow(:)=precip_snow(:)+precip_bs(:)
+      evap_totsnow(:)=evap(:)-fluxbs(:) ! flux bs is positive towards the surface (snow erosion)
     ELSE
-      precip_totsnow=precip_snow
-      evap_totsnow=evap
+      precip_totsnow(:)=precip_snow(:)
+      evap_totsnow(:)=evap(:)
     ENDIF
 

LMDZ6/trunk/libf/phylmd/surf_ocean_mod.F90

@@ -167 +167 @@
 
     IF (ok_bs) THEN
-       precip_totsnow=precip_snow+precip_bs
+       precip_totsnow(:)=precip_snow(:)+precip_bs(:)
     ELSE
-       precip_totsnow=precip_snow
+       precip_totsnow(:)=precip_snow(:)
     ENDIF