Changeset 1357 for LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3d/gcm.F

Timestamp:

Apr 14, 2010, 4:03:19 PM (14 years ago)

Author:

Ehouarn Millour

Message:

Some cleanup and fixing the possibility to output fields in the dynamics, on the dynamical grids.

CLEANUPS:

• arch-PW6_VARGAS.fcm : add potentially benefic compiling options
• removed obsolete "control.h" in dyn3d/dyn3dpar (module control_mod.F90 is used instead)

OUTPUTS in the dynamics (3 sets of files, one for each grid: scalar, u, v):

• removed "com_io_dyn.h" common; use module "com_io_dyn_mod.F90" instead
• updated "initdynav.F","inithist.F","writehist.F" and "writedynav.F" in bibio: which field will be written is hard coded there.
• flags "ok_dyn_ins" and "ok_dyn_ave" (loaded via conf_gcm.F) trigger output of fields in the dynamics: if ok_dyn_ins is true, then files "dyn_hist.nc", "dyn_histu.nc" and "dyn_histv.nc" are written (the frequency of the outputs is given by 'iecri' in run.def; values are written every 'iecri' dynamical step). if ok_dyn_ave is true then files "dyn_hist_ave.nc", "dyn_histu_ave.nc" and "dyn_histv_ave.nc" are written (the rate at which averages and made/written, in days, is given by 'periodav' in run.def).

EM

File:

• LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3d/gcm.F (modified) (3 diffs)

LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3d/gcm.F

@@ -73 +73 @@
 #include "description.h"
 #include "serre.h"
-#include "com_io_dyn.h"
+!#include "com_io_dyn.h"
 #include "iniprint.h"
 #include "tracstoke.h"
+#ifdef INCA
+! Only INCA needs these informations (from the Earth's physics)
 #include "indicesol.h"
-
+#endif
       INTEGER         longcles
       PARAMETER     ( longcles = 20 )
@@ -319 +321 @@
      .  ' restart ne correspondent pas a celles lues dans '
         write(lunout,*)' gcm.def'
-        write(lunout,*)' annee_ref=',annee_ref," anneeref=",anneeref
-        write(lunout,*)' day_ref=',day_ref," dayref=",dayref
-        write(lunout,*)' Pas de remise a zero'
+        write(lunout,*)' annee_ref=',annee_ref," anneeref=",anneeref
+        write(lunout,*)' day_ref=',day_ref," dayref=",dayref
+        write(lunout,*)' Pas de remise a zero'
       ENDIF
 
-c$$$      if (annee_ref .ne. anneeref .or. day_ref .ne. dayref) then
-c$$$        write(lunout,*)
-c$$$     .  'GCM: Attention les dates initiales lues dans le fichier'
-c$$$        write(lunout,*)
-c$$$     .  ' restart ne correspondent pas a celles lues dans '
-c$$$        write(lunout,*)' gcm.def'
-c$$$    write(lunout,*)' annee_ref=',annee_ref," anneeref=",anneeref
-c$$$    write(lunout,*)' day_ref=',day_ref," dayref=",dayref
-c$$$        if (raz_date .ne. 1) then
-c$$$          write(lunout,*)
-c$$$     .    'GCM: On garde les dates du fichier restart'
-c$$$        else
-c$$$          annee_ref = anneeref
-c$$$          day_ref = dayref
-c$$$          day_ini = dayref
-c$$$          itau_dyn = 0
-c$$$          itau_phy = 0
-c$$$          time_0 = 0.
-c$$$          write(lunout,*)
-c$$$     .   'GCM: On reinitialise a la date lue dans gcm.def'
-c$$$        endif
-c$$$      ELSE
-c$$$        raz_date = 0
-c$$$      endif
+c      if (annee_ref .ne. anneeref .or. day_ref .ne. dayref) then
+c        write(lunout,*)
+c     .  'GCM: Attention les dates initiales lues dans le fichier'
+c        write(lunout,*)
+c     .  ' restart ne correspondent pas a celles lues dans '
+c        write(lunout,*)' gcm.def'
+c        write(lunout,*)' annee_ref=',annee_ref," anneeref=",anneeref
+c        write(lunout,*)' day_ref=',day_ref," dayref=",dayref
+c        if (raz_date .ne. 1) then
+c          write(lunout,*)
+c     .    'GCM: On garde les dates du fichier restart'
+c        else
+c          annee_ref = anneeref
+c          day_ref = dayref
+c          day_ini = dayref
+c          itau_dyn = 0
+c          itau_phy = 0
+c          time_0 = 0.
+c          write(lunout,*)
+c     .   'GCM: On reinitialise a la date lue dans gcm.def'
+c        endif
+c      ELSE
+c        raz_date = 0
+c      endif
 
 #ifdef CPP_IOIPSL
@@ -461 +463 @@
 
 #ifdef CPP_IOIPSL
-      if ( 1.eq.1) then
       time_step = zdtvr
-      t_ops = iecri * daysec
-      t_wrt = iecri * daysec
-!      CALL inithist(dynhist_file,day_ref,annee_ref,time_step,
-!    .              t_ops, t_wrt, histid, histvid)
-
-!     IF (ok_dynzon) THEN 
-!        t_ops = iperiod * time_step
-!        t_wrt = periodav * daysec
-!        CALL initdynav(dynhistave_file,day_ref,annee_ref,time_step,
-!    .        t_ops, t_wrt, histaveid)
-!     END IF
+      if (ok_dyn_ins) then
+        ! initialize output file for instantaneous outputs
+        ! t_ops = iecri * daysec ! do operations every t_ops
+        t_ops =((1.0*iecri)/day_step) * daysec  
+        t_wrt = daysec ! iecri * daysec ! write output every t_wrt
+        CALL inithist(day_ref,annee_ref,time_step,
+     &              t_ops,t_wrt)
+      endif
+
+      IF (ok_dyn_ave) THEN 
+        ! initialize output file for averaged outputs
+        t_ops = iperiod * time_step ! do operations every t_ops
+        t_wrt = periodav * daysec   ! write output every t_wrt
+        CALL initdynav(day_ref,annee_ref,time_step,
+     &       t_ops,t_wrt)
+      END IF
       dtav = iperiod*dtvr/daysec
-      endif
-
-
 #endif
 ! #endif of #ifdef CPP_IOIPSL