/[lmdze]/trunk/phylmd/Interface_surf/interfsurf_hq.f

Diff of /trunk/phylmd/Interface_surf/interfsurf_hq.f

Parent Directory | Revision Log | View Patch Patch

-revision 154 by guez,
Tue Jul  7 17:49:23 2015 UTC
+revision 171 by guez,
Tue Sep 29 19:48:59 2015 UTC
 Line 9 
 contains
         spechum, tq_cdrag, petAcoef, peqAcoef, petBcoef, peqBcoef, &
         precip_rain, precip_snow, fder, rugos, rugoro, snow, qsurf, tsurf, &
         p1lay, ps, radsol, evap, fluxsens, fluxlat, dflux_l, dflux_s, &
-        tsurf_new, alblw, z0_new, pctsrf_new, agesno, fqcalving, ffonte, &
+        tsurf_new, albedo, z0_new, pctsrf_new, agesno, fqcalving, ffonte, &
         run_off_lic_0, flux_o, flux_g)
      ! Cette routine sert d'aiguillage entre l'atmosph\`ere et la surface
 Line 96 
 contains
      ! fluxlat flux de chaleur latente
      real, dimension(klon), intent(OUT):: dflux_l, dflux_s
      real, intent(OUT):: tsurf_new(knon) ! temp\'erature au sol
-     real, intent(OUT):: alblw(:) ! (knon) albedo
+     real, intent(OUT):: albedo(:) ! (knon) albedo
      real, intent(OUT):: z0_new(klon) ! surface roughness
      real, dimension(klon, nbsrf), intent(OUT):: pctsrf_new
      ! pctsrf_new nouvelle repartition des surfaces
 Line 149 
 contains
            print *, ' nisurf = ', nisurf, ' /= is_ter = ', is_ter
            print *, 'or on doit commencer par les surfaces continentales'
            abort_message='voir ci-dessus'
-           call abort_gcm(modname, abort_message, 1)
+           call abort_gcm(modname, abort_message)
         endif
         if (is_oce > is_sic) then
            print *, 'Warning:'
 Line 157 
 contains
            print *, ' l''ocean doit etre traite avant la banquise'
            print *, ' or is_oce = ', is_oce, '> is_sic = ', is_sic
            abort_message='voir ci-dessus'
-           call abort_gcm(modname, abort_message, 1)
+           call abort_gcm(modname, abort_message)
         endif
      endif
      first_call = .false.
 Line 182 
 contains
      select case (nisurf)
      case (is_ter)
-        ! Surface "terre" appel a l'interface avec les sols continentaux
+        ! Surface "terre", appel \`a l'interface avec les sols continentaux
         ! allocation du run-off
         if (.not. allocated(run_off)) then
            allocate(run_off(knon))
            run_off = 0.
         else if (size(run_off) /= knon) then
-           print *, 'Bizarre, le nombre de points continentaux'
+           call abort_gcm(modname, 'Something is wrong: the number of ' &
-           print *, 'a change entre deux appels. J''arrete '
+                // 'continental points has changed since last call.')
-           abort_message='voir ci-dessus'
-           call abort_gcm(modname, abort_message, 1)
         endif
         ! Calcul age de la neige
         ! calcul albedo: lecture albedo fichier boundary conditions
         ! puis ajout albedo neige
-        call interfsur_lim(itime, dtime, jour, knindex, debut, alblw, z0_new)
+        call interfsur_lim(itime, dtime, jour, knindex, debut, albedo, z0_new)
         ! calcul snow et qsurf, hydrol adapt\'e
         CALL calbeta(nisurf, snow(:knon), qsol(:knon), beta(:knon), &
-Line 212 
 contains
+Line 210 
 contains
         ELSE
            cal = RCPD * capsol
         ENDIF
-        CALL calcul_fluxs(nisurf, dtime, tsurf, p1lay(:knon), cal(:knon), &
+        CALL calcul_fluxs(dtime, tsurf, p1lay(:knon), cal(:knon), &
              beta(:knon), tq_cdrag(:knon), ps(:knon), qsurf(:knon), &
              radsol(:knon), dif_grnd(:knon), temp_air(:knon), spechum(:knon), &
              u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), peqAcoef(:knon), &
-Line 229 
 contains
+Line 228 
 contains
         call albsno(klon, knon, dtime, agesno, alb_neig, precip_snow)
         where (snow(1 : knon) < 0.0001) agesno(1 : knon) = 0.
         zfra(:knon) = max(0.0, min(1.0, snow(1:knon)/(snow(1:knon) + 10.0)))
-        alblw = alb_neig(:knon) * zfra(:knon) &
+        albedo = alb_neig(:knon) * zfra(:knon) &
-             + alblw * (1. - zfra(:knon))
+             + albedo * (1. - zfra(:knon))
         z0_new = sqrt(z0_new**2 + rugoro**2)
         ! Remplissage des pourcentages de surface
-Line 246 
 contains
+Line 245 
 contains
         dif_grnd = 0.
         alb_neig = 0.
         agesno = 0.
-        call calcul_fluxs(nisurf, dtime, tsurf_temp, p1lay(:knon), &
+        call calcul_fluxs(dtime, tsurf_temp, p1lay(:knon), &
              cal(:knon), beta(:knon), tq_cdrag(:knon), ps(:knon), &
              qsurf(:knon), radsol(:knon), dif_grnd(:knon), temp_air(:knon), &
              spechum(:knon), u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), &
-Line 261 
 contains
+Line 260 
 contains
         ! calcul albedo
         if (cycle_diurne) then
-           CALL alboc_cd(rmu0(knindex), alblw)
+           CALL alboc_cd(rmu0(knindex), albedo)
         else
-           CALL alboc(jour, rlat(knindex), alblw)
+           CALL alboc(jour, rlat(knindex), albedo)
         endif
         z0_new = sqrt(rugos**2 + rugoro**2)
-Line 300 
 contains
+Line 299 
 contains
         tsurf_temp = tsurf_new
         beta = 1.0
-        CALL calcul_fluxs(nisurf, dtime, tsurf_temp, p1lay(:knon), cal(:knon), &
+        CALL calcul_fluxs(dtime, tsurf_temp, p1lay(:knon), cal(:knon), &
              beta(:knon), tq_cdrag(:knon), ps(:knon), qsurf(:knon), &
              radsol(:knon), dif_grnd(:knon), temp_air(:knon), spechum(:knon), &
              u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), peqAcoef(:knon), &
-Line 326 
 contains
+Line 325 
 contains
         CALL albsno(klon, knon, dtime, agesno, alb_neig, precip_snow)
         WHERE (snow(1 : knon) < 0.0001) agesno(1 : knon) = 0.
         zfra(:knon) = MAX(0.0, MIN(1.0, snow(1:knon)/(snow(1:knon) + 10.0)))
-        alblw = alb_neig(:knon) * zfra(:knon) + 0.6 * (1.0 - zfra(:knon))
+        albedo = alb_neig(:knon) * zfra(:knon) + 0.6 * (1.0 - zfra(:knon))
         fder = fder + dflux_s + dflux_l
-Line 353 
 contains
+Line 352 
 contains
         beta = 1.0
         dif_grnd = 0.0
-        call calcul_fluxs(nisurf, dtime, tsurf, p1lay(:knon), cal(:knon), &
+        call calcul_fluxs(dtime, tsurf, p1lay(:knon), cal(:knon), &
              beta(:knon), tq_cdrag(:knon), ps(:knon), qsurf(:knon), &
              radsol(:knon), dif_grnd(:knon), temp_air(:knon), spechum(:knon), &
              u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), peqAcoef(:knon), &
-Line 371 
 contains
+Line 370 
 contains
         CALL albsno(klon, knon, dtime, agesno, alb_neig, precip_snow)
         WHERE (snow(1 : knon) < 0.0001) agesno(1 : knon) = 0.
         zfra(:knon) = MAX(0.0, MIN(1.0, snow(1:knon)/(snow(1:knon) + 10.0)))
-        alblw = 0.77
+        albedo = 0.77
         ! Rugosite
         z0_new = rugoro
-Line 382 
 contains
+Line 381 
 contains
      case default
         print *, 'Index surface = ', nisurf
         abort_message = 'Index surface non valable'
-        call abort_gcm(modname, abort_message, 1)
+        call abort_gcm(modname, abort_message)
      end select
    END SUBROUTINE interfsurf_hq

 Legend:



Removed from v.154
 


changed lines


 
Added in v.171
 Legend:



Removed from v.154
 


changed lines


 
Added in v.171
-Removed from v.154
+Added in v.171

	ViewVC Help
Powered by ViewVC 1.1.21