Changeset 900 for LMDZ4/trunk

Timestamp:

Feb 7, 2008, 3:26:01 PM (17 years ago)

Author:

Laurent Fairhead

Message:

Inclusion de la constante pmagic dans le calcul de l'albedo MAFO/JLD
LF

Location:

LMDZ4/trunk/libf/phylmd

Files:

• albedo.F (modified) (4 diffs)
• clesphys.h (modified) (2 diffs)
• conf_phys.F90 (modified) (4 diffs)

LMDZ4/trunk/libf/phylmd/albedo.F

@@ -75 +75 @@
       ENDDO
       IF (srmu .NE. 0.0) THEN
-         albedo(i) = salb / srmu * fmagic
+         albedo(i) = salb / srmu * fmagic+pmagic
       ELSE ! nuit polaire (on peut prendre une valeur quelconque)
          albedo(i) = fmagic
@@ -120 +120 @@
       ENDDO
       IF (srmu .NE. 0.0) THEN
-         albedo(i) = salb / srmu * fmagic
+         albedo(i) = salb / srmu * fmagic+pmagic
       ELSE ! nuit polaire (on peut prendre une valeur quelconque)
          albedo(i) = fmagic
@@ -170 +170 @@
 c
          fauxo = ( 1.47 - ACOS( rmu0(i) ) )/0.15
-         albedo(i) = fmagic*( .03 + .630/( 1. + fauxo*fauxo))
+         albedo(i) = fmagic*( .03 + .630/( 1. + fauxo*fauxo))+pmagic
          albedo(i) = MAX(MIN(albedo(i),0.60),0.04)
       ENDDO
@@ -181 +181 @@
          rmu0(i) = MAX(rmu0(i),0.0)
 cIM:orig albedo(i) = 0.058/(rmu0(i) + 0.30)
-         albedo(i) = fmagic * 0.058/(rmu0(i) + 0.30)
+         albedo(i) = fmagic * 0.058/(rmu0(i) + 0.30)+pmagic
          albedo(i) = MAX(MIN(albedo(i),0.60),0.04)
       ENDDO

LMDZ4/trunk/libf/phylmd/clesphys.h

@@ -31 +31 @@
 !IM ok_kzmin : clef calcul Kzmin dans la CL de surface cf FH
        LOGICAL ok_kzmin
-!IM fmagic : parametre pour regler l albedo sur ocean
-       REAL fmagic
+!IM, MAFo fmagic, pmagic : parametres - additionnel et multiplicatif - 
+!                          pour regler l albedo sur ocean
+       REAL fmagic, pmagic
 ! Hauteur (imposee) du contenu en eau du sol
            REAL qsol0
@@ -53 +54 @@
      &     , CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt                     &
      &     , top_height, overlap, cdmmax, cdhmax, ksta, ksta_ter        &
-     &     , ok_kzmin, fmagic, lev_histhf, lev_histday, lev_histmth     &
+     &     , ok_kzmin, fmagic, pmagic                                   &
+     &     , lev_histhf, lev_histday, lev_histmth                       &
      &     , type_run, ok_isccp, ok_regdyn                              &
      &     , lonmin_ins, lonmax_ins, latmin_ins, latmax_ins             &

LMDZ4/trunk/libf/phylmd/conf_phys.F90

@@ -101 +101 @@
   REAL,SAVE :: cdmmax_omp,cdhmax_omp,ksta_omp,ksta_ter_omp
   LOGICAL,SAVE :: ok_kzmin_omp
-  REAL, SAVE :: fmagic_omp
+  REAL, SAVE ::  fmagic_omp, pmagic_omp
   INTEGER,SAVE :: iflag_pbl_omp,lev_histhf_omp,lev_histday_omp,lev_histmth_omp
   CHARACTER*4, SAVE :: type_run_omp
@@ -685 +685 @@
 !
 !Config Key  = fmagic
-!Config Desc = 
+!Config Desc = additionnal multiplicator factor used for albedo
 !Config Def  = 1.
-!Config Help = Used in albedo.F
+!Config Help = additionnal multiplicator factor used in albedo.F
 !
   fmagic_omp = 1.
   call getin('fmagic',fmagic_omp)
+
+!
+!Config Key  = pmagic
+!Config Desc = additional factor used for albedo
+!Config Def  = 0.
+!Config Help = additional factor used in albedo.F
+!
+  pmagic_omp = 0.
+  call getin('pmagic',pmagic_omp)
+
 
 !Config Key = ok_lic_melt
@@ -941 +951 @@
     ok_kzmin = ok_kzmin_omp
     fmagic = fmagic_omp
+    pmagic = pmagic_omp
     iflag_pbl = iflag_pbl_omp
     lev_histhf = lev_histhf_omp
@@ -1043 +1054 @@
   write(numout,*)' ok_kzmin = ',ok_kzmin 
   write(numout,*)' fmagic = ',fmagic
+  write(numout,*)' pmagic = ',pmagic
   write(numout,*)' ok_ade = ',ok_ade
   write(numout,*)' ok_aie = ',ok_aie