Changeset 286 for trunk/LMDZ.MARS/libf/phymars

Timestamp:

Sep 8, 2011, 2:59:48 PM (13 years ago)

Author:

emillour

Message:

Mars GCM: Fixed problem about undefined tracer names in 'surfini.F' by calling 'initracer' before 'surfini' in physiq.F
EM

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• physiq.F (modified) (10 diffs)
• surfini.F (modified) (1 diff)

trunk/LMDZ.MARS/libf/phymars/physiq.F

@@ -341 +341 @@
 c        variables set to 0
 c        ~~~~~~~~~~~~~~~~~~
-         call zerophys(ngrid*nlayer*naerkind,aerosol)
-         call zerophys(ngrid*nlayer,dtrad)
-         call zerophys(ngrid,fluxrad)
+         aerosol(:,:,:)=0
+         dtrad(:,:)=0
+         fluxrad(:)=0
 
          wmax_th(:)=0.
@@ -368 +368 @@
 
          write (*,*) 'In physiq day_ini =', day_ini
+
+c        initialize tracers
+c        ~~~~~~~~~~~~~~~~~~
+         tracerdyn=tracer
+         IF (tracer) THEN
+            CALL initracer(qsurf,co2ice)
+         ENDIF  ! end tracer
 
 c        Initialize albedo and orbital calculation
@@ -389 +396 @@
          icount=1
 
-
-c        initialize tracers
-c        ~~~~~~~~~~~~~~~~~~
-         tracerdyn=tracer
-         IF (tracer) THEN
-            CALL initracer(qsurf,co2ice)
-         ENDIF  ! end tracer
-
-!#ifdef MESOSCALE
-!#include "meso_inc/meso_inc_caps.F"
-!#endif
-
 #ifndef MESOSCALE
 c        Initialize thermospheric parameters
@@ -440 +435 @@
 c     Initialize various variables
 c     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      call zerophys(ngrid*nlayer, pdv)
-      call zerophys(ngrid*nlayer, pdu)
-      call zerophys(ngrid*nlayer, pdt)
-      call zerophys(ngrid*nlayer*nq, pdq)
-      call zerophys(ngrid, pdpsrf)
-      call zerophys(ngrid, zflubid)
-      call zerophys(ngrid, zdtsurf)
-      call zerophys(ngrid*nq, dqsurf)
+      pdv(:,:)=0
+      pdu(:,:)=0
+      pdt(:,:)=0
+      pdq(:,:,:)=0
+      pdpsrf(:)=0
+      zflubid(:)=0
+      zdtsurf(:)=0
+      dqsurf(:,:)=0
       igout=ngrid/2+1 
 
@@ -553 +548 @@
 c          Outputs for basic check (middle of domain)
 c          ------------------------------------------
-           print*, 'check lat lon', lati(igout)*180/pi,
-     .                              long(igout)*180/pi
-           print*, 'Ls =',zls*180./pi
-           print*, 'tauref(700 Pa) =',tauref(igout)
-           print*, 'tau(700 Pa) =',tau(igout,1)*700./pplev(igout,1)
+           print*, 'Ls =',zls*180./pi,
+     &             'check lat lon', lati(igout)*180/pi,
+     &                              long(igout)*180/pi
+           print*, 'tauref(700 Pa) =',tauref(igout),
+     &             ' tau(700 Pa) =',tau(igout,1)*700./pplev(igout,1)
 
 c          ---------------------------------------------------------
@@ -601 +596 @@
 c          CO2 near infrared absorption
 c          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-           call zerophys(ngrid*nlayer,zdtnirco2)
+           zdtnirco2(:,:)=0
            if (callnirco2) then
               call nirco2abs (ngrid,nlayer,pplay,dist_sol,
@@ -686 +681 @@
          ENDDO
 
-         CALL zerophys(ngrid*nlayer,zdum1)
-         CALL zerophys(ngrid*nlayer,zdum2)
+         zdum1(:,:)=0
+         zdum2(:,:)=0
          do l=1,nlayer
             do ig=1,ngrid
@@ -832 +827 @@
             ENDDO
          ENDDO
-         CALL zerophys(ngrid*nlayer,zduadj)
-         CALL zerophys(ngrid*nlayer,zdvadj)
-         CALL zerophys(ngrid*nlayer,zdhadj)
+         zduadj(:,:)=0
+         zdvadj(:,:)=0
+         zdhadj(:,:)=0
 
          CALL convadj(ngrid,nlayer,nq,ptimestep,
@@ -1279 +1274 @@
            if (water) then
 
-             call zerophys(ngrid,mtot)
-             call zerophys(ngrid,icetot)
-             call zerophys(ngrid,rave)
-             call zerophys(ngrid,tauTES)
+             mtot(:)=0
+             icetot(:)=0
+             rave(:)=0
+             tauTES(:)=0
              do ig=1,ngrid 
                do l=1,nlayermx
@@ -1500 +1495 @@
         
          ! Compute co2 column
-         call zerophys(ngrid,co2col)
+         co2col(:)=0
          do l=1,nlayermx
            do ig=1,ngrid

trunk/LMDZ.MARS/libf/phymars/surfini.F

@@ -232 +232 @@
           do iq=1,nqmx
 c          if there is frost and surface albedo is set to albedo_h2o_ice
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!!! AS: problem initracer has not been called yet
-!!!!      noms(iq) has no information
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
            if(noms(iq).eq."h2o_ice") then
              do ig=1,ngrid