Changeset 1456

Timestamp:

Nov 22, 2010, 2:16:44 PM (14 years ago)

Author:

musat

Message:

phyetat0, phyredem: correction dimension verticale pbl_tke: pbl_tke(:,1:klev+1,:)
physiq: pour pouvoir fixer la longitude solaire avec la nouvelle orbite
JYG/IM

Location:

LMDZ5/branches/LMDZ5V2.0-dev/libf/phylmd

Files:

• phyetat0.F (modified) (5 diffs)
• phyredem.F (modified) (4 diffs)
• physiq.F (modified) (3 diffs)

LMDZ5/branches/LMDZ5V2.0-dev/libf/phylmd/phyetat0.F

@@ -21 +21 @@
       USE infotrac
       USE traclmdz_mod,    ONLY : traclmdz_from_restart
-      USE carbon_cycle_mod,ONLY :
-     &     carbon_cycle_tr, carbon_cycle_cpl, co2_send
+      USE carbon_cycle_mod,ONLY : carbon_cycle_tr, carbon_cycle_cpl
 
       IMPLICIT none
@@ -134 +133 @@
 
        
-      clesphy0(1)=tab_cntrl( 5 )
-      clesphy0(2)=tab_cntrl( 6 )
-      clesphy0(3)=tab_cntrl( 7 )
-      clesphy0(4)=tab_cntrl( 8 )
-      clesphy0(5)=tab_cntrl( 9 )
-      clesphy0(6)=tab_cntrl( 10 )
-      clesphy0(7)=tab_cntrl( 11 )
-      clesphy0(8)=tab_cntrl( 12 )
+
+         IF( clesphy0(1).NE.tab_cntrl( 5 ) )  THEN
+             clesphy0(1)=tab_cntrl( 5 )
+         ENDIF
+
+         IF( clesphy0(2).NE.tab_cntrl( 6 ) )  THEN
+             clesphy0(2)=tab_cntrl( 6 )
+         ENDIF
+
+         IF( clesphy0(3).NE.tab_cntrl( 7 ) )  THEN
+             clesphy0(3)=tab_cntrl( 7 )
+         ENDIF
+
+         IF( clesphy0(4).NE.tab_cntrl( 8 ) )  THEN
+             clesphy0(4)=tab_cntrl( 8 )
+         ENDIF
+
+         IF( clesphy0(5).NE.tab_cntrl( 9 ) )  THEN
+             clesphy0(5)=tab_cntrl( 9 )
+         ENDIF
+
+         IF( clesphy0(6).NE.tab_cntrl( 10 ) )  THEN
+             clesphy0(6)=tab_cntrl( 10 )
+         ENDIF
+
+         IF( clesphy0(7).NE.tab_cntrl( 11 ) )  THEN
+             clesphy0(7)=tab_cntrl( 11 )
+         ENDIF
+
+         IF( clesphy0(8).NE.tab_cntrl( 12 ) )  THEN
+             clesphy0(8)=tab_cntrl( 12 )
+         ENDIF
+
 
 c
@@ -817 +841 @@
           ENDIF
           WRITE(str2,'(i2.2)') nsrf
-          CALL get_field("TKE"//str2,pbl_tke(:,1:klev,nsrf),found)
+          CALL get_field("TKE"//str2,pbl_tke(:,1:klev+1,nsrf),found)
           IF (.NOT. found) THEN
             PRINT*, "phyetat0: <TKE"//str2//"> est absent"
@@ -824 +848 @@
           xmin = 1.0E+20
           xmax = -1.0E+20
-          DO k = 1, klev
+          DO k = 1, klev+1
             DO i = 1, klon
               xmin = MIN(pbl_tke(i,k,nsrf),xmin)
@@ -1054 +1078 @@
 
          END DO
+         
          CALL traclmdz_from_restart(trs)
-
-         IF (carbon_cycle_cpl) THEN
-            ALLOCATE(co2_send(klon), stat=ierr)
-            IF (ierr /= 0) CALL abort_gcm
-     &           ('phyetat0','pb allocation co2_send',1)
-            CALL get_field("co2_send",co2_send,found)
-            IF (.NOT. found) THEN
-               PRINT*,"phyetat0: Le champ <co2_send> est absent"
-               PRINT*,"Initialisation uniforme a co2_ppm=",co2_ppm
-               co2_send(:) = co2_ppm
-            END IF
-         END IF
       END IF
 

LMDZ5/branches/LMDZ5V2.0-dev/libf/phylmd/phyredem.F

@@ -11 +11 @@
       USE pbl_surface_mod,  ONLY : pbl_surface_final
       USE phys_state_var_mod
-      USE iostart
+      USE iostart  
       USE traclmdz_mod, ONLY : traclmdz_to_restart
       USE infotrac
       USE control_mod
-      USE carbon_cycle_mod, ONLY : carbon_cycle_cpl, co2_send
 
       IMPLICIT none
@@ -98 +97 @@
       CALL put_var("controle","Parametres de controle",tab_cntrl)
 c
-
       CALL put_field("longitude",
      .               "Longitudes de la grille physique",rlon)
@@ -289 +287 @@
             WRITE(str2,'(i2.2)') nsrf
             CALL put_field("TKE"//str2,"Energ. Cineti. Turb."//str2,
-     .                     pbl_tke(:,1:klev,nsrf))
+     .                     pbl_tke(:,1:klev+1,nsrf))
           ELSE
             PRINT*, "Trop de sous-mailles"
@@ -337 +335 @@
             CALL put_field("trs_"//tname(iiq),"",trs(:,it))
          END DO
-         IF (carbon_cycle_cpl) THEN
-            IF (.NOT. ALLOCATED(co2_send)) THEN
-               ! This is the case of create_etat0_limit, ce0l
-               ALLOCATE(co2_send(klon))
-               co2_send(:) = co2_ppm0
-            END IF
-            CALL put_field("co2_send","co2_ppm for coupling",co2_send)
-         END IF
       END IF
 

LMDZ5/branches/LMDZ5V2.0-dev/libf/phylmd/physiq.F

@@ -1250 +1250 @@
 cym Attention pbase pas initialise dans concvl !!!!
           pbase=0
+          paire_ter(:)=0.    
 cIM 180608
 c         pmflxr=0.
@@ -1846 +1847 @@
 ! doit donc etre placé avant radlwsw et pbl_surface
 
-! calcul selon la routine utilisee pour les planetes
-      if (new_orbit) then
-        call ymds2ju(year_cur, mth_eq, day_eq,0., jD_eq)
-        day_since_equinox = (jD_cur + jH_cur) - jD_eq 
-!        day_since_equinox = (jD_cur) - jD_eq 
-        call solarlong(day_since_equinox, zlongi, dist)
-      else      
-! calcul selon la routine utilisee pour l'AR4
+!!!   jyg 17 Sep 2010 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+      call ymds2ju(year_cur, mth_eq, day_eq,0., jD_eq)
+      day_since_equinox = (jD_cur + jH_cur) - jD_eq
+!
 !   choix entre calcul de la longitude solaire vraie ou valeur fixee a
 !   solarlong0
-        if (solarlong0<-999.) then
-           CALL orbite(REAL(days_elapsed+1),zlongi,dist)
-        else
+      if (solarlong0<-999.) then
+       if (new_orbit) then
+! calcul selon la routine utilisee pour les planetes
+        call solarlong(day_since_equinox, zlongi, dist)
+       else
+! calcul selon la routine utilisee pour l'AR4
+        CALL orbite(REAL(days_elapsed+1),zlongi,dist)
+       endif
+      else
            zlongi=solarlong0  ! longitude solaire vraie
            dist=1.            ! distance au soleil / moyenne
-        endif
       endif
+!!!
+
       if(prt_level.ge.1)                                                &
      &    write(lunout,*)'Longitude solaire ',zlongi,solarlong0,dist
@@ -3375 +3379 @@
      I                   cdragh,coefh,u1,v1,ftsol,pctsrf,
      I                   frac_impa, frac_nucl,
-     I                   pphis,airephy,dtime,itap,
-     I                   rlon,rlat,qx(:,:,ivap),da,phi,mp,upwd,dnwd)
+     I                   pphis,airephy,dtime,itap)