Changeset 648

Timestamp:

May 4, 2012, 10:24:20 AM (13 years ago)

Author:

emillour

Message:

Mars GCM:

• some syntax corrections in thermcall_main_mars, vdif_cd, pbl_parameters which cause problems when compiling with some strict compilers (g95, gfortran)
• added an initialisation of 'varian' in initracer for cases when using conrath dust; because that value can be is used elsewhere (e.g. surfacearea)

JYC+EM

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/phymars/initracer.F (modified) (1 diff)
• libf/phymars/pbl_parameters.F (modified) (1 diff)
• libf/phymars/thermcell_main_mars.F90 (modified) (1 diff)
• libf/phymars/vdif_cd.F (modified) (1 diff)
• makegcm_gfortran (modified) (1 diff)

trunk/LMDZ.MARS/README

@@ -1653 +1653 @@
   arguments in call to simpleclouds and rdust() should only be recomputed
   if dust_mass & dust_number tracers are available).
+
+== 04/05/12 == JYC+EM
+- some syntax corrections in thermcall_main_mars, vdif_cd, pbl_parameters
+  which cause problems when compiling with some strict compilers (g95, gfortran)
+- added an initialisation of 'varian' in initracer for cases when using
+  conrath dust; because that value can be is used elsewhere (e.g. surfacearea)

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

@@ -440 +440 @@
       else
 
+       ! initialize varian, which may be used (e.g. by surfacearea)
+       ! even with conrath dust
+       nueff_lift = 0.5
+       varian=sqrt(log(1.+nueff_lift))
+
        if (dustbin.gt.1) then
         print*,'initracer: STOP!',

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

@@ -149 +149 @@
 !       zu2(ig)=MAX(pu(ig,1)*pu(ig,1)+pv(ig,1)*pv(ig,1)
 !     &                                ,(0.3*wstar_in(ig))**2)
-       zu2(ig)=pu(ig,1)*pu(ig,1)+pv(ig,1)*pv(ig,1)+
+       zu2(ig)=pu(ig,1)*pu(ig,1)+pv(ig,1)*pv(ig,1)
      &     + (log(1.+0.7*wstar_in(ig) + 2.3*wstar_in(ig)**2))**2
 

trunk/LMDZ.MARS/libf/phymars/thermcell_main_mars.F90

@@ -1241 +1241 @@
 
       if (1 .eq. 0) then
-      call thermcell_dqup(ngridmx,nlayermx,ptimestep     &
-     &     ,fm,entr,  &
-     &    masse,ztv,zdthladj)
+!      call thermcell_dqup(ngridmx,nlayermx,ptimestep     &
+!     &     ,fm,entr,  &
+!     &    masse,ztv,zdthladj)
       else
 

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

@@ -150 +150 @@
 !         zu2(ig)=MAX(pu(ig,1)*pu(ig,1) + pv(ig,1)*pv(ig,1),             &
 !     &      (0.3*wstar(ig))**2)
-          zu2(ig)=pu(ig,1)*pu(ig,1) + pv(ig,1)*pv(ig,1) +
+          zu2(ig)=pu(ig,1)*pu(ig,1) + pv(ig,1)*pv(ig,1) 
      &     + (log(1.+0.7*wstar(ig) + 2.3*wstar(ig)**2))**2 
 

trunk/LMDZ.MARS/makegcm_gfortran

@@ -381 +381 @@
         else if $LINUX then
            ## for gfortran
-           set optim="-g -Wall -fcheck=all -fwhole-file -fbounds-check -ffpe-trap=invalid,zero,overflow"
-           set optim90="-g -Wall -fcheck=all -fwhole-file -fbounds-check -ffpe-trap=invalid,zero,overflow"
-           set optimtru90="-g -Wall -fcheck=all -fwhole-file -fbounds-check -ffpe-trap=invalid,zero,overflow"
+           set optim="-g -Wall -fbounds-check -ffpe-trap=invalid,zero,overflow"
+           set optim90="-g -Wall -fbounds-check -ffpe-trap=invalid,zero,overflow"
+           set optimtru90="-g -Wall -fbounds-check -ffpe-trap=invalid,zero,overflow"
         else 
            echo "pas d option debug predefinie pour cette machine"