Changeset 53 for trunk/libf/dyn3d

Timestamp:

Jan 31, 2011, 10:29:25 AM (14 years ago)

Author:

aslmd

Message:

modele principal: commit mineur:

M libf/dyn3d/leapfrog.F
M libf/dyn3d/comconst.h
M libf/dyn3d/iniacademic.F
M libf/dyn3d/conf_planete.F90
propagation des changements du commit 52 a la dynamique sequentielle

Location:

trunk/libf/dyn3d

Files:

• comconst.h (modified) (2 diffs)
• conf_planete.F90 (modified) (1 diff)
• iniacademic.F (modified) (4 diffs)
• leapfrog.F (modified) (1 diff)

trunk/libf/dyn3d/comconst.h

@@ -11 +11 @@
      &                   ,dissip_factz,dissip_deltaz,dissip_zref        &
      &                   ,tau_top_bound,                                &
-     & daylen,year_day,molmass
+     & daylen,year_day,molmass, ihf
       COMMON/cpdetvenus/nu_venus,t0_venus
 
@@ -36 +36 @@
 
       REAL nu_venus,t0_venus ! coeffs needed for Cp(T), Venus atmosphere
+      REAL ihf  ! (W/m2) intrinsic heat flux for giant planets
 
 

trunk/libf/dyn3d/conf_planete.F90

@@ -64 +64 @@
 CALL getin('omeg',omeg)
 
+! Intrinsic heat flux [default is none]
+! Aymeric -- for giant planets
+! [matters only if planet_type="giant"]
+ihf = 0.
+CALL getin('ihf',ihf)
+
+
+
 END SUBROUTINE conf_planete

trunk/libf/dyn3d/iniacademic.F

@@ -96 +96 @@
 ! --------------------------------------
 c
+
+        print *, 'This is iniacademic' 
+
         ! initialize planet radius, rotation rate,...
         call conf_planete
@@ -155 +158 @@
           teta0=315.     ! mean Teta (S.H. 315K)
           CALL getin('teta0',teta0)
+          print *, 'iniacademic - teta0 ', teta0
+          print *, 'iniacademic - rad ', rad
           ttp=200.       ! Tropopause temperature (S.H. 200K)
           CALL getin('ttp',ttp)
@@ -200 +205 @@
              tetajl(j,l)=teta0-delt_y*ddsin*ddsin+eps*ddsin
      &           -delt_z*(1.-ddsin*ddsin)*log(zsig)
+             !! Aymeric -- tests particuliers
+             if (planet_type=="giant") then
+             tetajl(j,l)=teta0+(delt_y*
+     &          ((sin(rlatu(j)*3.14159*eps+0.0001))**2)
+     &          / ((rlatu(j)*3.14159*eps+0.0001)**2))
+     &          -delt_z*log(zsig)
+!!!             ddsin=sin(2.5*3.14159*rlatu(j))
+!!!             tetajl(j,l)=teta0-delt_y*ddsin*ddsin
+!!!!     &           -delt_z*(1.-ddsin*ddsin)*log(zsig)
+             endif
              ! Profil stratospherique isotherme (+vortex)
              w_pv=(1.-tanh((rlatu(j)-phi_pv)/dphi_pv))/2.
@@ -217 +232 @@
             enddo
           enddo
+          PRINT *, 'iniacademic - check',tetajl(:,int(llm/2)),rlatu(:)
 
 

trunk/libf/dyn3d/leapfrog.F

@@ -472 +472 @@
         ENDDO ! of DO l=1,llm 
           call friction(ucov,vcov,dtvr)
-        
+    
+       if (planet_type.eq."giant") then
+          ! Intrinsic heat flux
+          ! Aymeric -- for giant planets
+          if (ihf .gt. 1.e-6) then
+          !print *, '**** INTRINSIC HEAT FLUX ****', ihf 
+            DO ij=1,ip1jmp1
+              teta(ij,1) = teta(ij,1)
+     &        + dtvr * aire(ij) * ihf / cpp / masse(ij,1)
+            ENDDO
+          !print *, '**** d teta ' 
+          !print *, dtvr * aire(ijb:ije) * ihf / cpp / masse(ijb:ije,1)
+          endif
+       endif
+
+    
         ! Sponge layer (if any)
         IF (ok_strato) THEN