Changeset 1119 for trunk/LMDZ.MARS/libf/aeronomars

Timestamp:

Nov 28, 2013, 6:51:01 AM (11 years ago)

Author:

emillour

Message:

Mars GCM:

• Bug fix: Sun-Mars distance was not correctly taken into account in the solvarmod==1 (daily varying realistic EUV input) case.

FGG

Location:

trunk/LMDZ.MARS/libf/aeronomars

Files:

• chemthermos.F90 (modified) (1 diff)
• euvheat.F90 (modified) (2 diffs)
• hrtherm.F (modified) (2 diffs)
• jthermcalc.F (modified) (3 diffs)

trunk/LMDZ.MARS/libf/aeronomars/chemthermos.F90

@@ -472 +472 @@
 
       !Photoabsorption coefficients
+      call flujo(solarcondate)
       if(solvarmod.eq.0) then
-         call flujo(solarcondate)!+zday/365.)
          call jthermcalc(ig,chemthermod,rm,nesptherm,ztemp,zlocal,zenit)
       else if(solvarmod.eq.1) then

trunk/LMDZ.MARS/libf/aeronomars/euvheat.F90

@@ -369 +369 @@
       
       !Solar flux calculation
-      if(solvarmod.eq.0) call flujo(solarcondate)
+      call flujo(solarcondate)
 
                                          ! Not recommended for long runs 
@@ -429 +429 @@
                                               !the actual Mars-Sun distance
         enddo   
-      enddo  ! of do ig=1,ngrid
+      enddo  ! of do ig=1,ngrid 
+        
       !Deallocations
 !      deallocate(rm)

trunk/LMDZ.MARS/libf/aeronomars/hrtherm.F

@@ -105 +105 @@
       else if (solvarmod.eq.1) then
          call jthermcalc_e107(ig,euvmod,rm,nespeuv,tx,iz,zenit,zday)
-         do indexint=1,ninter
-            fluxtop(indexint)=1.
-         enddo
       endif
 
@@ -123 +120 @@
       end do
 
+
       return
 

trunk/LMDZ.MARS/libf/aeronomars/jthermcalc.F

@@ -296 +296 @@
              !H interpolated coefficient
              jfotsout(indexint,12,auxi) = wm(i)*auxjh(ind+1) +
-     $            wp(i)*auxjh(ind)             
+     $            wp(i)*auxjh(ind) 
           enddo
           !Only if chemthermod.ge.2
@@ -1690 +1690 @@
       include 'param.h'
       include 'param_v4.h'
+      include "callkeys.h"
 
 
@@ -1713 +1714 @@
          !For more details, see Gonzalez-Galindo et al. 2005
          !To be improved in next versions
-        if(i.le.24) then
-          fluxtop(i)=(((ct1(i)+p1(i)*date)/2.)                  
-     $        *sin(2.*3.1416/11.*(date-1985.-3.1416))          
-     $        +(ct2(i)+p2(i)*date)+1.)*fluxtop(i)
-        end if
-        fluxtop(i)=fluxtop(i)*(1.52/dist_sol)**2
-      end do
-!      fluxtop(1)=fluxtop(1)*10.
-!      fluxtop(2)=fluxtop(2)*5.
+        if(i.le.24.and.solvarmod.eq.0) then
+            fluxtop(i)=(((ct1(i)+p1(i)*date)/2.)                  
+     $           *sin(2.*3.1416/11.*(date-1985.-3.1416))          
+     $           +(ct2(i)+p2(i)*date)+1.)*fluxtop(i)
+         end if
+         fluxtop(i)=fluxtop(i)*(1.52/dist_sol)**2
+      end do
      
       return