Changeset 690

Timestamp:

Jun 4, 2012, 10:37:25 AM (13 years ago)

Author:

acolaitis

Message:

Code re-organization in diverse parts of the GCM code. These are NOT cosmetic changes, but are needed for compilation of the Mesoscale model in NESTED configuration

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/aeronomars/moldiff.F (modified) (1 diff)
• libf/aeronomars/molvis.F (modified) (1 diff)
• libf/aeronomars/param_v4.h (modified) (2 diffs)
• libf/aeronomars/paramfoto_compact.F (modified) (1 diff)
• libf/aeronomars/photochemistry.F (modified) (1 diff)
• libf/bibio/writestd.F (modified) (1 diff)
• libf/dyn3d/comdissnew.h (modified) (1 diff)
• libf/phymars/aeroptproperties.F (modified) (1 diff)
• libf/phymars/co2snow.F (modified) (1 diff)
• libf/phymars/datareadnc.F (modified) (1 diff)
• libf/phymars/inistats.F (modified) (2 diffs)
• libf/phymars/nirco2abs.F (modified) (1 diff)
• libf/phymars/nlte_calc.F (modified) (1 diff)
• libf/phymars/yamada4.F (modified) (1 diff)

trunk/LMDZ.MARS/README

@@ -1687 +1687 @@
   dust scenarios (derived from the 7 MY24 to MY30 scenarios) in
   aeropacity.F and read_dust_scenario.F
+
+== 04/06/12 == AC
+- Code re-organization in diverse parts of the GCM code. These are NOT cosmetic
+changes, but are needed for compilation of the Mesoscale model in NESTED configuration
+using the new physics.

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

@@ -294 +294 @@
 c       *******************************************
         do n=1,ncompmoldiff-1
-          call lubksb_sp(alf,ncompmoldiff-1,ncompmoldiff-1,indx,y(1,n))
+       call lubksb_sp(alf,ncompmoldiff-1,ncompmoldiff-1,indx,y(1,n))
           do nn=1,ncompmoldiff-1
             alfinv(l,nn,n)=y(nn,n)/hh

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

@@ -1 @@
-       SUBROUTINE molvis(ptimestep,pplay,pplev,pt,pdteuv,pdtconduc,pvel,
-     $                   tsurf,zzlev,zzlay,zdvelmolvis)
+       SUBROUTINE molvis(ptimestep,pplay,pplev,pt,pdteuv,pdtconduc
+     $           ,pvel,tsurf,zzlev,zzlay,zdvelmolvis)
       IMPLICIT NONE
 

trunk/LMDZ.MARS/libf/aeronomars/param_v4.h

@@ -150 +150 @@
 
 
-      common/vida/ tminco2,tmino2,tmino3p,tminco,tminh,tminoh,tminho2,        &
-     &               tminh2,tminh2o,tmino1d,tminh2o2,tmino3,tminn,            &
-     &               tminno,tminno2,tminn2,tminn2d,                           &
-     &               tminco2plus,tminoplus,tmino2plus,tmincoplus,             &
-     &               tmincplus,tminnplus,tminnoplus,                          &
-     &               tminn2plus,tminhplus,tminhco2plus
+      common/vida/ tminco2,tmino2,tmino3p,tminco,tminh,tminoh,                &
+     &      tminho2,tminh2,tminh2o,tmino1d,tminh2o2,tmino3,tminn,             &
+     &      tminno,tminno2,tminn2,tminn2d,                                    &
+     &      tminco2plus,tminoplus,tmino2plus,tmincoplus,                      &
+     &      tmincplus,tminnplus,tminnoplus,                                   &
+     &      tminn2plus,tminhplus,tminhco2plus
 
 
@@ -181 +181 @@
         real ct1(ninter),p1(ninter),ct2(ninter),p2(ninter)       
 
-      common/phdisef/ efdisco2, efdiso2, efdish2, efdish2o, efdish2o2,        &
-     &                efdiso3,efdiso,efdisn,efdish,efdisno,efdisn2,           &
-     &                efdisno2,efdisco,efionco2,efionn2,efionco,              &
-     &                efiono3p,efionn,efionno,efionh
+      common/phdisef/ efdisco2, efdiso2, efdish2, efdish2o,                   &
+     & efdish2o2,efdiso3,efdiso,efdisn,efdish,efdisno,efdisn2,                &
+     & efdisno2,efdisco,efionco2,efionn2,efionco,                             &
+     & efiono3p,efionn,efionno,efionh
   
 

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

@@ -428 +428 @@
                end if
            ! elect
-               call implicito ( ig, electxoutput_timemarching,   'elec', 
+            call implicito ( ig, electxoutput_timemarching,   'elec', 
      &              electxinput,Pelecttot(i),Lelecttot(i),deltat)
             endif !Of chemthermod.eq.3

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

@@ -10 +10 @@
 c*****************************************************************
 c
-      subroutine photochemistry(lswitch, zycol, sza, ptimestep, press,
-     $                          temp, dens, dist_sol, surfdust1d,
-     $                          surfice1d, jo3, tau)
+      subroutine photochemistry(lswitch, zycol, sza, ptimestep, 
+     $                  press,temp, dens, dist_sol, surfdust1d,
+     $                  surfice1d, jo3, tau)
 c
       implicit none

trunk/LMDZ.MARS/libf/bibio/writestd.F

@@ -169 +169 @@
       ELSE
          IF (gformat(1:lnblnk(gformat)) .EQ. 'zxli1') THEN
-            CALL to36 (champ,icount,champ(imin),champ(imax),55, 1)
+            CALL to36 (champ,icount,champ(imin),champ(imax),55,1)
          ELSE 
             IF (gformat(1:lnblnk(gformat)) .EQ. 'zxli2') THEN
-               CALL to36(champ,icount,champ(imin),champ(imax),55,2)
+            CALL to36(champ,icount,champ(imin),champ(imax),55,2)
             ELSE
                IF (gformat(1:lnblnk(gformat)) .EQ. 'zxli3') THEN
-                  CALL to36(champ,icount,champ(imin),champ(imax),55,3)
+            CALL to36(champ,icount,champ(imin),champ(imax),55,3)
                ELSE
                   WRITE(55,'('//gformat(1:lnblnk(gformat))//')') 

trunk/LMDZ.MARS/libf/dyn3d/comdissnew.h

@@ -2 +2 @@
 c INCLUDE comdissnew.h
 
-      COMMON/comdissnew/ lstardis,nitergdiv,nitergrot,niterh,tetagdiv,
-     1                   tetagrot,tetatemp,coefdis 
+      COMMON/comdissnew/ lstardis,nitergdiv,nitergrot,niterh,
+     1                   tetagdiv,tetagrot,tetatemp,coefdis 
 
       LOGICAL lstardis

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

@@ -1174 +1174 @@
           ENDDO ! lg
           write(out_str(1:1),'(i1.1)') out_nchannel
-          call WRITEDIAGFI(ngrid,'qextir'//out_str,"Ext.efficiency","",
+       call WRITEDIAGFI(ngrid,'qextir'//out_str,"Ext.efficiency","",
      &                     3,out_qext)
-          call WRITEDIAGFI(ngrid,'omegir'//out_str,"Sing.Scat.Alb.","",
+       call WRITEDIAGFI(ngrid,'omegir'//out_str,"Sing.Scat.Alb.","",
      &                     3,out_omeg)
-          call WRITEDIAGFI(ngrid,'gir'//out_str,"Asym.Factor","",
+       call WRITEDIAGFI(ngrid,'gir'//out_str,"Asym.Factor","",
      &                     3,out_g)
 c     -------------------------------------------------------------

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

@@ -1 @@
-      SUBROUTINE co2snow (ngrid,nlayer,ptimestep,emisref,condsub,pplev,
-     &        pcondicea,pcondices,pfallice,pemisurf)
+      SUBROUTINE co2snow (ngrid,nlayer,ptimestep,emisref,condsub
+     &         ,pplev,pcondicea,pcondices,pfallice,pemisurf)
 
        IMPLICIT NONE

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

@@ -122 +122 @@
         write(*,*)'(in phymars/datareadnc.F)'
         write(*,*)'It should be in :',trim(datafile),'/'
-        write(*,*)'1) You can set this path in the callphys.def file:'
+        write(*,*)'1) You can set this path in the 
+     & callphys.def file:'
         write(*,*)'   datadir=/path/to/the/datafiles'
         write(*,*)'2) If necessary, surface.nc (and other datafiles)'

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

@@ -92 +92 @@
       ierr = NF_PUT_VAR_REAL (nid,nvarid,pseudoalt)
 #endif 
-      call def_var_stats(nid,"aps","hybrid pressure at midlayers"," ", 
-     &            1,idim_llm,nvarid,ierr)
+      call def_var_stats(nid,"aps","hybrid pressure at midlayers"
+     & ," ",1,idim_llm,nvarid,ierr)
 #ifdef NC_DOUBLE
       ierr = NF_PUT_VAR_DOUBLE (nid,nvarid,aps)
@@ -100 +100 @@
 #endif
 
-      call def_var_stats(nid,"bps","hybrid sigma at midlayers"," ", 
-     &            1,idim_llm,nvarid,ierr)
+      call def_var_stats(nid,"bps","hybrid sigma at midlayers"
+     & ," ",1,idim_llm,nvarid,ierr)
 #ifdef NC_DOUBLE
       ierr = NF_PUT_VAR_DOUBLE (nid,nvarid,bps)

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

@@ -197 +197 @@
                      pyy(l)=pplay(ig,l)
                   enddo
-                  call interpnir(cor1,pyy,nlayer,corgcm,pres1d,npres)
-                  call interpnir(oldoco2,pyy,nlayer,oco21d,pres1d,npres)
-                  call interpnir(alfa2,pyy,nlayer,alfa,pres1d,npres)
+               call interpnir(cor1,pyy,nlayer,corgcm,pres1d,npres)
+               call interpnir(oldoco2,pyy,nlayer,oco21d,pres1d,npres)
+               call interpnir(alfa2,pyy,nlayer,alfa,pres1d,npres)
                endif
 

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

@@ -6 +6 @@
 c     a calculation of transmittances and derivatives of these ones   
       
-      subroutine mzescape(ig,taustar,tauinf,tauii, ib,isot, iirw,iimu)       
+      subroutine mzescape(ig,taustar,tauinf,tauii,
+     &  ib,isot, iirw,iimu) 
 
 c     jul 2011        malv+fgg   adapted to LMD-MGCM                        

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

@@ -596 +596 @@
       return
       end
-      SUBROUTINE vdif_q2(timestep,gravity,rconst,ngrid,nlay,plev,temp,
-     &  kmy,q2)
+      SUBROUTINE vdif_q2(timestep,gravity,rconst,ngrid,nlay
+     & ,plev,temp,kmy,q2)
       IMPLICIT NONE
 !.......................................................................