Ignore:
Timestamp:
Apr 14, 2010, 4:03:19 PM (15 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

Location:
LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3d
Files:
1 added
2 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3d/control_mod.F90

    r1320 r1357  
    11!
    2 ! $Id$
     2! $Id $
    33!
    44
    … …  
    1414  INTEGER :: iconser,iecri,idissip,iphysiq,iecrimoy
    1515  INTEGER :: dayref,anneeref, raz_date, ip_ebil_dyn
    16   LOGICAL :: offline, output_grads_dyn, ok_dynzon
     16  LOGICAL :: offline
    1717  CHARACTER (len=4)  :: config_inca
    18   CHARACTER (len=10) :: planet_type
     18  CHARACTER (len=10) :: planet_type ! planet type ('earth','mars',...)
     19  LOGICAL output_grads_dyn ! output dynamics diagnostics in
     20                           ! binary grads file 'dyn.dat' (y/n)
     21  LOGICAL ok_dynzon  ! output zonal transports in dynzon.nc file
     22  LOGICAL ok_dyn_ins ! output instantaneous values of fields
     23                     ! in the dynamics in NetCDF files dyn_hist*nc
     24  LOGICAL ok_dyn_ave ! output averaged values of fields in the dynamics
     25                     ! in NetCDF files dyn_hist*ave.nc
    1926
    2027END MODULE

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

    r1333 r1357  
    7373#include "description.h"
    7474#include "serre.h"
    75 #include "com_io_dyn.h"
     75!#include "com_io_dyn.h"
    7676#include "iniprint.h"
    7777#include "tracstoke.h"
     78#ifdef INCA
     79! Only INCA needs these informations (from the Earth's physics)
    7880#include "indicesol.h"
    79 
     81#endif
    8082      INTEGER         longcles
    8183      PARAMETER     ( longcles = 20 )
    … …  
    319321     .  ' restart ne correspondent pas a celles lues dans '
    320322        write(lunout,*)' gcm.def'
    321         write(lunout,*)' annee_ref=',annee_ref," anneeref=",anneeref
    322         write(lunout,*)' day_ref=',day_ref," dayref=",dayref
    323         write(lunout,*)' Pas de remise a zero'
     323        write(lunout,*)' annee_ref=',annee_ref," anneeref=",anneeref
     324        write(lunout,*)' day_ref=',day_ref," dayref=",dayref
     325        write(lunout,*)' Pas de remise a zero'
    324326      ENDIF
    325327
    326 c$$$      if (annee_ref .ne. anneeref .or. day_ref .ne. dayref) then
    327 c$$$        write(lunout,*)
    328 c$$$     .  'GCM: Attention les dates initiales lues dans le fichier'
    329 c$$$        write(lunout,*)
    330 c$$$     .  ' restart ne correspondent pas a celles lues dans '
    331 c$$$        write(lunout,*)' gcm.def'
    332 c$$$    write(lunout,*)' annee_ref=',annee_ref," anneeref=",anneeref
    333 c$$$    write(lunout,*)' day_ref=',day_ref," dayref=",dayref
    334 c$$$        if (raz_date .ne. 1) then
    335 c$$$          write(lunout,*)
    336 c$$$     .    'GCM: On garde les dates du fichier restart'
    337 c$$$        else
    338 c$$$          annee_ref = anneeref
    339 c$$$          day_ref = dayref
    340 c$$$          day_ini = dayref
    341 c$$$          itau_dyn = 0
    342 c$$$          itau_phy = 0
    343 c$$$          time_0 = 0.
    344 c$$$          write(lunout,*)
    345 c$$$     .   'GCM: On reinitialise a la date lue dans gcm.def'
    346 c$$$        endif
    347 c$$$      ELSE
    348 c$$$        raz_date = 0
    349 c$$$      endif
     328c      if (annee_ref .ne. anneeref .or. day_ref .ne. dayref) then
     329c        write(lunout,*)
     330c     .  'GCM: Attention les dates initiales lues dans le fichier'
     331c        write(lunout,*)
     332c     .  ' restart ne correspondent pas a celles lues dans '
     333c        write(lunout,*)' gcm.def'
     334c        write(lunout,*)' annee_ref=',annee_ref," anneeref=",anneeref
     335c        write(lunout,*)' day_ref=',day_ref," dayref=",dayref
     336c        if (raz_date .ne. 1) then
     337c          write(lunout,*)
     338c     .    'GCM: On garde les dates du fichier restart'
     339c        else
     340c          annee_ref = anneeref
     341c          day_ref = dayref
     342c          day_ini = dayref
     343c          itau_dyn = 0
     344c          itau_phy = 0
     345c          time_0 = 0.
     346c          write(lunout,*)
     347c     .   'GCM: On reinitialise a la date lue dans gcm.def'
     348c        endif
     349c      ELSE
     350c        raz_date = 0
     351c      endif
    350352
    351353#ifdef CPP_IOIPSL
    … …  
    461463
    462464#ifdef CPP_IOIPSL
    463       if ( 1.eq.1) then
    464465      time_step = zdtvr
    465       t_ops = iecri * daysec
    466       t_wrt = iecri * daysec
    467 !      CALL inithist(dynhist_file,day_ref,annee_ref,time_step,
    468 !    .              t_ops, t_wrt, histid, histvid)
    469 
    470 !     IF (ok_dynzon) THEN
    471 !        t_ops = iperiod * time_step
    472 !        t_wrt = periodav * daysec
    473 !        CALL initdynav(dynhistave_file,day_ref,annee_ref,time_step,
    474 !    .        t_ops, t_wrt, histaveid)
    475 !     END IF
     466      if (ok_dyn_ins) then
     467        ! initialize output file for instantaneous outputs
     468        ! t_ops = iecri * daysec ! do operations every t_ops
     469        t_ops =((1.0*iecri)/day_step) * daysec 
     470        t_wrt = daysec ! iecri * daysec ! write output every t_wrt
     471        CALL inithist(day_ref,annee_ref,time_step,
     472     &              t_ops,t_wrt)
     473      endif
     474
     475      IF (ok_dyn_ave) THEN
     476        ! initialize output file for averaged outputs
     477        t_ops = iperiod * time_step ! do operations every t_ops
     478        t_wrt = periodav * daysec   ! write output every t_wrt
     479        CALL initdynav(day_ref,annee_ref,time_step,
     480     &       t_ops,t_wrt)
     481      END IF
    476482      dtav = iperiod*dtvr/daysec
    477       endif
    478 
    479 
    480483#endif
    481484! #endif of #ifdef CPP_IOIPSL

  • LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3d/leapfrog.F

    r1299 r1357  
    6060#include "description.h"
    6161#include "serre.h"
    62 #include "com_io_dyn.h"
     62!#include "com_io_dyn.h"
    6363#include "iniprint.h"
    6464#include "academic.h"
    … …  
    197197
    198198      itau = 0
    199 c$$$      iday = day_ini+itau/day_step
    200 c$$$      time = REAL(itau-(iday-day_ini)*day_step)/day_step+time_0
    201 c$$$         IF(time.GT.1.) THEN
    202 c$$$          time = time-1.
    203 c$$$          iday = iday+1
    204 c$$$         ENDIF
     199c      iday = day_ini+itau/day_step
     200c      time = REAL(itau-(iday-day_ini)*day_step)/day_step+time_0
     201c         IF(time.GT.1.) THEN
     202c          time = time-1.
     203c          iday = iday+1
     204c         ENDIF
    205205
    206206
    … …  
    276276
    277277      IF( purmats ) THEN
     278      ! Purely Matsuno time stepping
    278279         IF( MOD(itau,iconser) .EQ.0.AND.  forward    ) conser = .TRUE.
    279280         IF( MOD(itau,idissip ).EQ.0.AND..NOT.forward ) apdiss = .TRUE.
    … …  
    281282     s          .and. iflag_phys.EQ.1                 ) apphys = .TRUE.
    282283      ELSE
     284      ! Leapfrog/Matsuno time stepping
    283285         IF( MOD(itau   ,iconser) .EQ. 0              ) conser = .TRUE.
    284286         IF( MOD(itau+1,idissip)  .EQ. 0              ) apdiss = .TRUE.
    285287         IF( MOD(itau+1,iphysiq).EQ.0.AND.iflag_phys.EQ.1) apphys=.TRUE.
    286288      END IF
     289
     290! Ehouarn: for Shallow Water case (ie: 1 vertical layer),
     291!          supress dissipation step
     292      if (llm.eq.1) then
     293        apdiss=.false.
     294      endif
    287295
    288296c-----------------------------------------------------------------------
    … …  
    522530            IF(forward. OR. leapf) THEN
    523531              itau= itau + 1
    524 c$$$              iday= day_ini+itau/day_step
    525 c$$$              time= REAL(itau-(iday-day_ini)*day_step)/day_step+time_0
    526 c$$$                IF(time.GT.1.) THEN
    527 c$$$                  time = time-1.
    528 c$$$                  iday = iday+1
    529 c$$$                ENDIF
     532c              iday= day_ini+itau/day_step
     533c              time= REAL(itau-(iday-day_ini)*day_step)/day_step+time_0
     534c                IF(time.GT.1.) THEN
     535c                  time = time-1.
     536c                  iday = iday+1
     537c                ENDIF
    530538            ENDIF
    531539
    … …  
    559567               IF (ok_dynzon) THEN
    560568#ifdef CPP_IOIPSL
    561 !                  CALL writedynav(histaveid, itau,vcov ,
    562 !     ,                 ucov,teta,pk,phi,q,masse,ps,phis)
    563                   CALL bilan_dyn (2,dtvr*iperiod,dtvr*day_step*periodav,
    564      ,                 ps,masse,pk,pbaru,pbarv,teta,phi,ucov,vcov,q)
     569                 CALL bilan_dyn(2,dtvr*iperiod,dtvr*day_step*periodav,
     570     &                 ps,masse,pk,pbaru,pbarv,teta,phi,ucov,vcov,q)
    565571#endif
    566572               END IF
    567 
    568             ENDIF
     573               IF (ok_dyn_ave) THEN
     574#ifdef CPP_IOIPSL
     575                 CALL writedynav(itau,vcov,
     576     &                 ucov,teta,pk,phi,q,masse,ps,phis)
     577#endif
     578               ENDIF
     579
     580            ENDIF ! of IF((MOD(itau,iperiod).EQ.0).OR.(itau.EQ.itaufin))
    569581
    570582c-----------------------------------------------------------------------
    … …  
    572584c   ------------------------------
    573585
    574             IF( MOD(itau,iecri         ).EQ.0) THEN
    575 c           IF( MOD(itau,iecri*day_step).EQ.0) THEN
    576 
     586            IF( MOD(itau,iecri).EQ.0) THEN
     587             ! Ehouarn: output only during LF or Backward Matsuno
     588             if (leapf.or.(.not.leapf.and.(.not.forward))) then
    577589              nbetat = nbetatdem
    578590              CALL geopot(ip1jmp1,teta,pk,pks,phis,phi)
    … …  
    583595              enddo
    584596#ifdef CPP_IOIPSL
    585 c             CALL writehist(histid,histvid,itau,vcov,
    586 c     &                      ucov,teta,phi,q,masse,ps,phis)
     597              if (ok_dyn_ins) then
     598!               write(lunout,*) "leapfrog: call writehist, itau=",itau
     599               CALL writehist(itau,vcov,ucov,teta,phi,q,masse,ps,phis)
     600!               call WriteField('ucov',reshape(ucov,(/iip1,jmp1,llm/)))
     601!               call WriteField('vcov',reshape(vcov,(/iip1,jjm,llm/)))
     602!              call WriteField('teta',reshape(teta,(/iip1,jmp1,llm/)))
     603!               call WriteField('ps',reshape(ps,(/iip1,jmp1/)))
     604!               call WriteField('masse',reshape(masse,(/iip1,jmp1,llm/)))
     605              endif ! of if (ok_dyn_ins)
    587606#endif
    588607! For some Grads outputs of fields
    589              if (output_grads_dyn) then
     608              if (output_grads_dyn) then
    590609#include "write_grads_dyn.h"
    591              endif
    592 
     610              endif
     611             endif ! of if (leapf.or.(.not.leapf.and.(.not.forward)))
    593612            ENDIF ! of IF(MOD(itau,iecri).EQ.0)
    594613
    … …  
    645664
    646665             itau =  itau + 1
    647 c$$$             iday = day_ini+itau/day_step
    648 c$$$             time = REAL(itau-(iday-day_ini)*day_step)/day_step+time_0
    649 c$$$
    650 c$$$                  IF(time.GT.1.) THEN
    651 c$$$                   time = time-1.
    652 c$$$                   iday = iday+1
    653 c$$$                  ENDIF
     666c             iday = day_ini+itau/day_step
     667c             time = REAL(itau-(iday-day_ini)*day_step)/day_step+time_0
     668c
     669c                  IF(time.GT.1.) THEN
     670c                   time = time-1.
     671c                   iday = iday+1
     672c                  ENDIF
    654673
    655674               forward =  .FALSE.
    … …  
    660679               GO TO 2
    661680
    662             ELSE ! of IF(forward)
     681            ELSE ! of IF(forward) i.e. backward step
    663682
    664683              IF(MOD(itau,iperiod).EQ.0 .OR. itau.EQ.itaufin) THEN
    … …  
    671690               IF (ok_dynzon) THEN
    672691#ifdef CPP_IOIPSL
    673 !                  CALL writedynav(histaveid, itau,vcov ,
    674 !     ,                 ucov,teta,pk,phi,q,masse,ps,phis)
    675                   CALL bilan_dyn (2,dtvr*iperiod,dtvr*day_step*periodav,
    676      ,                 ps,masse,pk,pbaru,pbarv,teta,phi,ucov,vcov,q)
    677 #endif
    678                END IF
     692                 CALL bilan_dyn(2,dtvr*iperiod,dtvr*day_step*periodav,
     693     &                 ps,masse,pk,pbaru,pbarv,teta,phi,ucov,vcov,q)
     694#endif
     695               ENDIF
     696               IF (ok_dyn_ave) THEN
     697#ifdef CPP_IOIPSL
     698                 CALL writedynav(itau,vcov,
     699     &                 ucov,teta,pk,phi,q,masse,ps,phis)
     700#endif
     701               ENDIF
    679702
    680703              ENDIF ! of IF(MOD(itau,iperiod).EQ.0 .OR. itau.EQ.itaufin)
    … …  
    690713                enddo
    691714#ifdef CPP_IOIPSL
    692 c               CALL writehist( histid, histvid, itau,vcov ,
    693 c    &                           ucov,teta,phi,q,masse,ps,phis)
     715              if (ok_dyn_ins) then
     716!                write(lunout,*) "leapfrog: call writehist (b)",
     717!     &                        itau,iecri
     718                CALL writehist(itau,vcov,ucov,teta,phi,q,masse,ps,phis)
     719              endif ! of if (ok_dyn_ins)
    694720#endif
    695721! For some Grads outputs
Note: See TracChangeset for help on using the changeset viewer.