Changeset 250

Timestamp:

Aug 1, 2011, 12:27:23 PM (13 years ago)

Author:

aslmd

Message:

MESOSCALE: corrected a problem of passing an integer as a real between module_lmd_driver and inifis. it was apparently not a problem but it is better to avoid this.

Location:

trunk

Files:

• LMDZ.MARS/libf/phymars/meso_inc/meso_inc_inifisini.F (modified) (1 diff)
• MESOSCALE/LMD_MM_MARS/SRC/WRFV2/mars_lmd/libf/phymars/inifis.F (modified) (2 diffs)
• MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F (modified) (4 diffs)

trunk/LMDZ.MARS/libf/phymars/meso_inc/meso_inc_inifisini.F

@@ -89 +89 @@
 c*****************************************************
         dtphys=wdt*ptimestep 
-        print*,'Physical timestep (s) ',dtphys, ptimestep
+        print*,'Physical timestep (s) ',dtphys

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/mars_lmd/libf/phymars/inifis.F

@@ -87 +87 @@
       INTEGER ig,ierr
 
-      INTEGER wecri_phys, wappel_phys
+      INTEGER wecri_phys
+      REAL wappel_phys
  
       EXTERNAL iniorbit,orbite
@@ -526 +527 @@
 c Opportunity is taken to fill ecri_phys as well
 c*****************************************************
-        dtphys=wdt*float(wappel_phys)
+        dtphys=wdt*wappel_phys
         print*,'Physical timestep (s) ',dtphys
         ecri_phys=8.e18  !! a dummy low frequency

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F

@@ -223 +223 @@
    INTEGER :: sponge_top,relax,ips,ipe,jps,jpe,kps,kpe
    REAL :: elaps, ptimestep
-   INTEGER :: wappel_phys, wday_ini, test, test2
+   INTEGER :: wday_ini, test, test2
+   REAL :: wappel_phys
    LOGICAL :: flag_LES
 
@@ -327 +328 @@
 !----------------------------!
 wday_ini = JULDAY - 1      !! GCM convention
-wappel_phys = int(RADT)
-ptimestep = dt*float(wappel_phys)     ! physical timestep (s)
+wappel_phys = RADT
+ptimestep = dt*wappel_phys            ! physical timestep (s)
 ngrid=(ipe-ips+1)*(jpe-jps+1)         ! size of the horizontal grid: ngridmx = wiim * wjjm
 nlayer = kpe-kps+1                    ! number of vertical layers: nlayermx
@@ -393 +394 @@
 ! what is done for the other steps of simulation  !
 !-------------------------------------------------!
-IF (wappel_phys .gt. 0) THEN
+IF (wappel_phys .gt. 0.) THEN
 firstcall = .false.
-test = MODULO(itimestep-1,wappel_phys) ! WRF time is integrated time (itimestep=1 at the end of first step) 
-                                       ! -- same strategy as diagfi in the LMD GCM 
+test = MODULO(itimestep-1,int(wappel_phys)) ! WRF time is integrated time (itimestep=1 at the end of first step) 
+                                            ! -- same strategy as diagfi in the LMD GCM 
+                                            ! -- arguments of modulo must be of the same kind (here: integers)
 ELSE
 firstcall = .false.
@@ -1086 +1088 @@
 !! PHYSIQ !!
 !!********!!
-call_physics : IF (wappel_phys .ne. 0) THEN
+call_physics : IF (wappel_phys .ne. 0.) THEN
 
 !-------------------------------------------------------------------------------!