Changeset 1022 for trunk/LMDZ.COMMON/libf/dyn3dpar

Timestamp:

Aug 30, 2013, 11:28:18 AM (11 years ago)

Author:

emillour

Message:

Common dynamics: Minor correction in sortvarc.F (to handle cases when initial condition is generated via iniacademic) and addition of the possibility to run a given number of dynamical steps (ndynstep=...), as it is already implemented in the Mars GCM.
EM

Location:

trunk/LMDZ.COMMON/libf/dyn3dpar

Files:

• conf_gcm.F (modified) (2 diffs)
• control_mod.F90 (modified) (1 diff)
• gcm.F (modified) (2 diffs)
• leapfrog_p.F (modified) (2 diffs)
• sortvarc.F (modified) (1 diff)

trunk/LMDZ.COMMON/libf/dyn3dpar/conf_gcm.F

@@ -189 +189 @@
       CALL getin('nday',nday)
 
+      ! alternative to specifying nday (see also 'less1day' and 'fractday'
+      ! options below: sopecify numbre of dynamic steps to run:
+      ndynstep = -9999 ! default value ; if ndynstep <0 then option not used.
+      call getin('ndynstep',ndynstep)
+      
 !Config  Key  = starttime
 !Config  Desc = Heure de depart de la simulation
@@ -956 +961 @@
       write(lunout,*)' anneeref = ', anneeref
       write(lunout,*)' nday = ', nday
+      if (ndynstep.ne.-9999) write(lunout,*)' ndynstep = ', ndynstep
+      if (less1day) write(lunout,*)' fractday = ', fractday
       write(lunout,*)' day_step = ', day_step
       write(lunout,*)' iperiod = ', iperiod

trunk/LMDZ.COMMON/libf/dyn3dpar/control_mod.F90

@@ -27 +27 @@
   LOGICAL :: less1day   ! allows to run less than 1 day (for Venus)
   REAL    :: fractday   ! fraction of the day to run in this case
+  
+  integer :: ndynstep ! Alternative to using less1day&fractday; user may
+                      ! specify number of dynamical steps to run
 
 END MODULE

trunk/LMDZ.COMMON/libf/dyn3dpar/gcm.F

@@ -24 +24 @@
       USE getparam
       USE filtreg_mod
-      USE control_mod
+      USE control_mod, only: planet_type,nday,day_step,iperiod,iphysiq,
+     &                       raz_date,anneeref,starttime,dayref,
+     &                       ok_dyn_ins,ok_dyn_ave,iecri,periodav,
+     &                       less1day,fractday,ndynstep
       use cpdet_mod, only: ini_cpdet
 
@@ -521 +524 @@
 
       day_end = day_ini + nday
-      WRITE(lunout,300)day_ini,day_end
- 300  FORMAT('1'/,15x,'run du jour',i7,2x,'au jour',i7//)
+      if (less1day) then
+        day_end=day_ini+floor(time_0+fractday)
+      endif
+      if (ndynstep.gt.0) then
+        day_end=day_ini+floor(time_0+float(ndynstep)/float(day_step))
+      endif
+      
+      WRITE(lunout,'(a,i7,a,i7)')
+     &             "run from day ",day_ini,"  to day",day_end
 
 #ifdef CPP_IOIPSL

trunk/LMDZ.COMMON/libf/dyn3dpar/leapfrog_p.F

@@ -20 +20 @@
        USE guide_p_mod, ONLY : guide_main
        USE getparam
-       USE control_mod
+       USE control_mod, only: planet_type,nday,day_step,iperiod,iphysiq,
+     &                       less1day,fractday,ndynstep,iconser,
+     &                       dissip_period,offline,ip_ebil_dyn,
+     &                       ok_dynzon,periodav,ok_dyn_ave,iecri,
+     &                       ok_dyn_ins,output_grads_dyn,
+     &                       iapp_tracvl
        use cpdet_mod, only: cpdet,tpot2t_glo_p,t2tpot_glo_p
        use sponge_mod_p, only: callsponge,mode_sponge,sponge_p
@@ -235 +240 @@
 c MODIF VENUS: to run less than one day:
         itaufin   = int(fractday*day_step)
+      endif
+      if (ndynstep.gt.0) then
+        ! running a given number of dynamical steps
+        itaufin=ndynstep
       endif
       itaufinp1 = itaufin +1

trunk/LMDZ.COMMON/libf/dyn3dpar/sortvarc.F

@@ -154 +154 @@
       END IF
 
-      etot= etot/etot0
+      ! compute relative changes in etot,... (except if 'reference' values
+      ! are zero, which can happen when using iniacademic)
+      if (etot0.ne.0) then
+        etot= etot/etot0
+      else
+        etot=1.
+      endif
       rmsv= SQRT(rmsv/ptot)
-      ptot= ptot/ptot0
-      ztot= ztot/ztot0
-      stot= stot/stot0
-      ang = ang /ang0
+      if (ptot0.ne.0) then
+        ptot= ptot/ptot0
+      else
+        ptot=1.
+      endif
+      if (ztot0.ne.0) then
+        ztot= ztot/ztot0
+      else
+        ztot=1.
+      endif
+      if (stot0.ne.0) then
+        stot= stot/stot0
+      else
+        stot=1.
+      endif
+      if (ang0.ne.0) then
+        ang = ang /ang0
+      else
+        ang=1.
+      endif
 
       firstcal = .false.