Changeset 1526 for trunk/LMDZ.GENERIC

Timestamp:

Apr 1, 2016, 3:07:57 PM (9 years ago)

Author:

mturbet

Message:

minor buggs and modifications

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• bilinearbig.F90 (modified) (1 diff)
• callcorrk.F90 (modified) (2 diffs)
• condense_co2.F90 (modified) (1 diff)
• mass_redistribution.F90 (modified) (1 diff)

trunk/LMDZ.GENERIC/libf/phystd/bilinearbig.F90

@@ -56 +56 @@
 !     ... and for y within the temperature range
       if ((y.lt.y_arr(1)).or.(y.gt.y_arr(nY))) then
-         write(*,*) 'Warning from bilinearH2H2:'
+         write(*,*) 'Warning from bilinearbig routine:'
          write(*,*) 'Outside continuum temperature range!'
          if(y.lt.y_arr(1))then

trunk/LMDZ.GENERIC/libf/phystd/callcorrk.F90

@@ -180 +180 @@
       ! Included by MT for albedo calculations.      
       REAL*8 albedo_temp(L_NSPECTV) ! For equivalent albedo calculation.
-
+      REAL*8 surface_stellar_flux   ! Stellar flux reaching the surface. Useful for equivalent albedo calculation.
 
 
@@ -809 +809 @@
 
 
-         ! Equivalent Albedo Calculation. MT2015
-         if(fract(ig) .ge. 1.0e-4) then ! equivalent albedo makes sense only during daylight.            
-            DO nw=1,L_NSPECTV             
-               albedo_temp(nw)=albedo(ig,nw)*nfluxgndv_nu(nw)
-            ENDDO
-            albedo_temp(1:L_NSPECTV)=albedo_temp(1:L_NSPECTV)/sum(nfluxgndv_nu(1:L_NSPECTV))
-            albedo_equivalent(ig)=sum(albedo_temp(1:L_NSPECTV))
+         ! Equivalent Albedo Calculation (for OUTPUT). MT2015
+         if(fract(ig) .ge. 1.0e-4) then ! equivalent albedo makes sense only during daylight.       
+            surface_stellar_flux=sum(nfluxgndv_nu(1:L_NSPECTV))      
+            if(surface_stellar_flux .gt. 1.0e-3) then ! equivalent albedo makes sense only if the stellar flux received by the surface is positive.
+               DO nw=1,L_NSPECTV                  
+                  albedo_temp(nw)=albedo(ig,nw)*nfluxgndv_nu(nw)
+               ENDDO
+               albedo_temp(1:L_NSPECTV)=albedo_temp(1:L_NSPECTV)/surface_stellar_flux
+               albedo_equivalent(ig)=sum(albedo_temp(1:L_NSPECTV))
+            else
+               albedo_equivalent(ig)=0.0 ! Spectrally Integrated Albedo not defined for non-irradiated grid points. So we arbitrary set the equivalent albedo to 0.
+            endif
          else
             albedo_equivalent(ig)=0.0 ! Spectrally Integrated Albedo not defined for non-irradiated grid points. So we arbitrary set the equivalent albedo to 0.

trunk/LMDZ.GENERIC/libf/phystd/condense_co2.F90

@@ -411 +411 @@
 
             IF(ABS(pdpsrfc(ig)*ptimestep).GT.pplev(ig,1)) THEN
-               PRINT*,'STOP in condens'
+               PRINT*,'STOP in condens in condense_co2'
                PRINT*,'condensing more than total mass'
                PRINT*,'Grid point ',ig

trunk/LMDZ.GENERIC/libf/phystd/mass_redistribution.F90

@@ -166 +166 @@
       do ig = 1, ngrid
         IF(ABS(pdpsrfmr(ig)*ptimestep).GT.pplev(ig,1)) THEN
-         PRINT*,'STOP in condens'
+         PRINT*,'STOP in condens in mass_redistribution'
          PRINT*,'condensing more than total mass'
          PRINT*,'Grid point ',ig