Changeset 1446 for LMDZ5/branches/LMDZ5V1.0-dev/libf/dyn3d/iniacademic.F

Timestamp:

Oct 22, 2010, 11:27:25 AM (14 years ago)

Author:

Ehouarn Millour

Message:

Implemented modifications to enable running with only one tracer for planet types different from "earth". Rem: If flag 'planet_type' is set to "earth" (default behaviour) then there must be at least 2 tracers for the dynamics to function properly.

These updates do not induce any changes in model outputs with respect to previous revisions.

EM

File:

• LMDZ5/branches/LMDZ5V1.0-dev/libf/dyn3d/iniacademic.F (modified) (8 diffs)

LMDZ5/branches/LMDZ5V1.0-dev/libf/dyn3d/iniacademic.F

@@ -8 +8 @@
       USE filtreg_mod
       USE infotrac, ONLY : nqtot
-      USE control_mod
+      USE control_mod, ONLY: day_step,planet_type
 #ifdef CPP_IOIPSL
       USE IOIPSL
@@ -95 +95 @@
 ! 1. Initializations for Earth-like case
 ! --------------------------------------
-      if (planet_type=="earth") then
 c
         ! initialize planet radius, rotation rate,...
@@ -128 +127 @@
           if (.not.read_start) then
             phis(:)=0.
-            q(:,:,1)=1.e-10
-            q(:,:,2)=1.e-15
-            q(:,:,3:nqtot)=0.
+            q(:,:,:)=0
             CALL sw_case_williamson91_6(vcov,ucov,teta,masse,ps)
           endif
@@ -138 +135 @@
           ! initializations for the academic case
           
+!         if (planet_type=="earth") then
+
           ! 1. local parameters
           ! by convention, winter is in the southern hemisphere
@@ -219 +218 @@
           enddo
 
+
+!         else
+!          write(lunout,*)"iniacademic: planet types other than earth",
+!     &                   " not implemented (yet)."
+!          stop
+!         endif ! of if (planet_type=="earth")
+
           ! 3. Initialize fields (if necessary)
           IF (.NOT. read_start) THEN
@@ -245 +251 @@
             
             ! bulk initialization of tracers
-            do i=1,nqtot
-              if (i.eq.1) q(:,:,i)=1.e-10
-              if (i.eq.2) q(:,:,i)=1.e-15
-              if (i.gt.2) q(:,:,i)=0.
-            enddo
+            if (planet_type=="earth") then
+              ! Earth: first two tracers will be water
+              do i=1,nqtot
+                if (i.eq.1) q(:,:,i)=1.e-10
+                if (i.eq.2) q(:,:,i)=1.e-15
+                if (i.gt.2) q(:,:,i)=0.
+              enddo
+            else
+              q(:,:,:)=0
+            endif ! of if (planet_type=="earth")
 
             ! add random perturbation to temperature
@@ -261 +272 @@
             enddo
 
+            ! maintain periodicity in longitude
             do l=1,llm
               do ij=1,ip1jmp1,iip1
@@ -267 +279 @@
             enddo
 
-c     PRINT *,' Appel test_period avec tetarappel '
-c     CALL  test_period ( ucov,vcov,tetarappel,q,p,phis )
-c     PRINT *,' Appel test_period avec teta '
-c     CALL  test_period ( ucov,vcov,teta,q,p,phis )
-
-           ! initialize a traceur on one column
-!          j=jjp1*3/4
-!          i=iip1/2
-!          ij=(j-1)*iip1+i
-!          q(ij,:,3)=1.
-
           ENDIF ! of IF (.NOT. read_start)
         endif ! of if (iflag_phys.eq.2)
         
-      else
-        write(lunout,*)"iniacademic: planet types other than earth",
-     &                 " not implemented (yet)."
-        stop
-      endif ! of if (planet_type=="earth")
-      return
       END
 c-----------------------------------------------------------------------