Ignore:
Timestamp:
Dec 14, 2015, 11:43:09 AM (9 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2298:2396 into testing branch

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/phylmd/initphysto.F90

    r1910 r2408  
    88  USE IOIPSL
    99  USE iophy
    10   USE control_mod
    1110  USE indice_sol_mod
     11  USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, nbp_lev
     12  USE time_phylmdz_mod, ONLY: day_ref, annee_ref
    1213 
    1314  IMPLICIT NONE
     
    3738!
    3839! =====================================================================
    39 !
    40 !   Declarations
    41   INCLUDE "dimensions.h"
    42   INCLUDE "paramet.h"
    43   INCLUDE "comconst.h"
    44   INCLUDE "comgeom.h"
    45   INCLUDE "temps.h"
    46   INCLUDE "logic.h"
    47   INCLUDE "description.h"
    48   INCLUDE "serre.h"
    4940
    5041!   Arguments
     
    5849  INTEGER nhoriid, i
    5950  INTEGER l,k
    60   REAL nivsigs(llm)
     51  REAL nivsigs(nbp_lev)
    6152  INTEGER tau0
    6253  REAL zjulian
     
    6657  INTEGER zan, idayref
    6758  LOGICAL ok_sync
    68   REAL zx_lon(iim,jjm+1), zx_lat(iim,jjm+1)
     59  REAL zx_lon(nbp_lon,nbp_lat), zx_lat(nbp_lon,nbp_lat)
    6960  CHARACTER(len=12) :: nvar
    7061
    7162!  Initialisations
    7263!
    73   pi = 4. * ATAN (1.)
    7464  ok_sync= .TRUE.
    7565!
     
    8878!  Appel a histvert pour la grille verticale
    8979!
    90   DO l=1,llm
     80  DO l=1,nbp_lev
    9181     nivsigs(l)=REAL(l)
    9282  ENDDO
     
    9484  CALL histvert(fileid, 'sig_s', 'Niveaux sigma', &
    9585       'sigma_level', &
    96        llm, nivsigs, zvertiid)
     86       nbp_lev, nivsigs, zvertiid)
    9787!
    9888!  Appels a histdef pour la definition des variables a sauvegarder
    9989!
    10090  CALL histdef(fileid, "phis", "Surface geop. height", "-", &
    101        iim,jj_nb,nhoriid, 1,1,1, -99, 32, &
     91       nbp_lon,jj_nb,nhoriid, 1,1,1, -99, 32, &
    10292       "once", t_ops, t_wrt)
    10393 
    10494  CALL histdef(fileid, "aire", "Grid area", "-", &
    105        iim,jj_nb,nhoriid, 1,1,1, -99, 32, &
     95       nbp_lon,jj_nb,nhoriid, 1,1,1, -99, 32, &
    10696       "once", t_ops, t_wrt)
    10797
    10898  CALL histdef(fileid, "longitudes", "longitudes", "-", &
    109        iim,jj_nb,nhoriid, 1,1,1, -99, 32, &
     99       nbp_lon,jj_nb,nhoriid, 1,1,1, -99, 32, &
    110100       "once", t_ops, t_wrt)
    111101
    112102  CALL histdef(fileid, "latitudes", "latitudes", "-", &
    113        iim,jj_nb,nhoriid, 1,1,1, -99, 32, &
     103       nbp_lon,jj_nb,nhoriid, 1,1,1, -99, 32, &
    114104       "once", t_ops, t_wrt)
    115105! T
    116   CALL histdef(fileid, 't', 'Temperature', 'K', iim, jj_nb, nhoriid, &
    117        llm, 1, llm, zvertiid, 32, 'inst(X)', t_ops, t_wrt)
     106  CALL histdef(fileid, 't', 'Temperature', 'K', nbp_lon, jj_nb, nhoriid, &
     107       nbp_lev, 1, nbp_lev, zvertiid, 32, 'inst(X)', t_ops, t_wrt)
    118108! mfu
    119   CALL histdef(fileid, 'mfu', 'flx m. pan. mt', 'kg m/s',iim, jj_nb, nhoriid, &
    120        llm, 1, llm, zvertiid,32, 'inst(X)', t_ops, t_wrt)
     109  CALL histdef(fileid, 'mfu', 'flx m. pan. mt', 'kg m/s',nbp_lon, jj_nb, nhoriid, &
     110       nbp_lev, 1, nbp_lev, zvertiid,32, 'inst(X)', t_ops, t_wrt)
    121111! mfd
    122   CALL histdef(fileid, 'mfd', 'flx m. pan. des', 'kg m/s',iim, jj_nb, nhoriid, &
    123        llm, 1, llm, zvertiid, 32, 'inst(X)', t_ops, t_wrt)
     112  CALL histdef(fileid, 'mfd', 'flx m. pan. des', 'kg m/s',nbp_lon, jj_nb, nhoriid, &
     113       nbp_lev, 1, nbp_lev, zvertiid, 32, 'inst(X)', t_ops, t_wrt)
    124114! en_u
    125   CALL histdef(fileid, 'en_u', 'flx ent pan mt', 'kg m/s', iim, jj_nb, nhoriid, &
    126        llm, 1, llm, zvertiid,32, 'inst(X)', t_ops, t_wrt)
     115  CALL histdef(fileid, 'en_u', 'flx ent pan mt', 'kg m/s', nbp_lon, jj_nb, nhoriid, &
     116       nbp_lev, 1, nbp_lev, zvertiid,32, 'inst(X)', t_ops, t_wrt)
    127117! de_u
    128   CALL histdef(fileid, 'de_u', 'flx det pan mt', 'kg m/s',iim, jj_nb, nhoriid, &
    129        llm, 1, llm, zvertiid,32, 'inst(X)', t_ops, t_wrt)
     118  CALL histdef(fileid, 'de_u', 'flx det pan mt', 'kg m/s',nbp_lon, jj_nb, nhoriid, &
     119       nbp_lev, 1, nbp_lev, zvertiid,32, 'inst(X)', t_ops, t_wrt)
    130120! en_d
    131   CALL histdef(fileid, 'en_d', 'flx ent pan dt', 'kg m/s', iim, jj_nb, nhoriid, &
    132        llm, 1, llm, zvertiid,32, 'inst(X)', t_ops, t_wrt)
     121  CALL histdef(fileid, 'en_d', 'flx ent pan dt', 'kg m/s', nbp_lon, jj_nb, nhoriid, &
     122       nbp_lev, 1, nbp_lev, zvertiid,32, 'inst(X)', t_ops, t_wrt)
    133123! de_d
    134   CALL histdef(fileid, 'de_d', 'flx det pan dt', 'kg m/s', iim, jj_nb, nhoriid, &
    135        llm, 1, llm, zvertiid, 32, 'inst(X)', t_ops, t_wrt)
     124  CALL histdef(fileid, 'de_d', 'flx det pan dt', 'kg m/s', nbp_lon, jj_nb, nhoriid, &
     125       nbp_lev, 1, nbp_lev, zvertiid, 32, 'inst(X)', t_ops, t_wrt)
    136126! coefh
    137   CALL histdef(fileid, "coefh", " ", " ", iim, jj_nb, nhoriid, &
    138        llm, 1, llm, zvertiid,32, "inst(X)", t_ops, t_wrt)
     127  CALL histdef(fileid, "coefh", " ", " ", nbp_lon, jj_nb, nhoriid, &
     128       nbp_lev, 1, nbp_lev, zvertiid,32, "inst(X)", t_ops, t_wrt)
    139129! fm_th
    140   CALL histdef(fileid, "fm_th", " ", " ",iim, jj_nb, nhoriid, &
    141        llm, 1, llm, zvertiid,32, "inst(X)", t_ops, t_wrt)
     130  CALL histdef(fileid, "fm_th", " ", " ",nbp_lon, jj_nb, nhoriid, &
     131       nbp_lev, 1, nbp_lev, zvertiid,32, "inst(X)", t_ops, t_wrt)
    142132! en_th
    143   CALL histdef(fileid, "en_th", " ", " ",iim, jj_nb, nhoriid, &
    144        llm, 1, llm, zvertiid,32, "inst(X)", t_ops, t_wrt)
     133  CALL histdef(fileid, "en_th", " ", " ",nbp_lon, jj_nb, nhoriid, &
     134       nbp_lev, 1, nbp_lev, zvertiid,32, "inst(X)", t_ops, t_wrt)
    145135! frac_impa
    146   CALL histdef(fileid, 'frac_impa', ' ', ' ',iim, jj_nb, nhoriid, &
    147        llm, 1, llm, zvertiid,32, 'inst(X)', t_ops, t_wrt)
     136  CALL histdef(fileid, 'frac_impa', ' ', ' ',nbp_lon, jj_nb, nhoriid, &
     137       nbp_lev, 1, nbp_lev, zvertiid,32, 'inst(X)', t_ops, t_wrt)
    148138! frac_nucl
    149   CALL histdef(fileid, 'frac_nucl', ' ', ' ',iim, jj_nb, nhoriid, &
    150        llm, 1, llm, zvertiid,32, 'inst(X)', t_ops, t_wrt)
     139  CALL histdef(fileid, 'frac_nucl', ' ', ' ',nbp_lon, jj_nb, nhoriid, &
     140       nbp_lev, 1, nbp_lev, zvertiid,32, 'inst(X)', t_ops, t_wrt)
    151141! pyu1
    152   CALL histdef(fileid, "pyu1", " ", " ", iim,jj_nb,nhoriid, &
     142  CALL histdef(fileid, "pyu1", " ", " ", nbp_lon,jj_nb,nhoriid, &
    153143       1,1,1, -99, 32, "inst(X)", t_ops, t_wrt)
    154144! pyv1
    155   CALL histdef(fileid, "pyv1", " ", " ", iim,jj_nb,nhoriid, &
     145  CALL histdef(fileid, "pyv1", " ", " ", nbp_lon,jj_nb,nhoriid, &
    156146       1,1,1, -99, 32,"inst(X)", t_ops, t_wrt)   
    157147! ftsol1
    158   CALL histdef(fileid, "ftsol1", " ", " ",iim, jj_nb, nhoriid, &
     148  CALL histdef(fileid, "ftsol1", " ", " ",nbp_lon, jj_nb, nhoriid, &
    159149       1, 1,1, -99,32, "inst(X)", t_ops, t_wrt)
    160150! ftsol2
    161   CALL histdef(fileid, "ftsol2", " ", " ",iim, jj_nb, nhoriid, &
     151  CALL histdef(fileid, "ftsol2", " ", " ",nbp_lon, jj_nb, nhoriid, &
    162152       1, 1,1, -99,32, "inst(X)", t_ops, t_wrt)
    163153! ftsol3
    164   CALL histdef(fileid, "ftsol3", " ", " ", iim, jj_nb, nhoriid, &
     154  CALL histdef(fileid, "ftsol3", " ", " ", nbp_lon, jj_nb, nhoriid, &
    165155       1, 1,1, -99,32, "inst(X)", t_ops, t_wrt)
    166156! ftsol4
    167   CALL histdef(fileid, "ftsol4", " ", " ",iim, jj_nb, nhoriid, &
     157  CALL histdef(fileid, "ftsol4", " ", " ",nbp_lon, jj_nb, nhoriid, &
    168158       1, 1,1, -99, 32, "inst(X)", t_ops, t_wrt)
    169159! psrf1
    170   CALL histdef(fileid, "psrf1", " ", " ",iim, jj_nb, nhoriid, &
     160  CALL histdef(fileid, "psrf1", " ", " ",nbp_lon, jj_nb, nhoriid, &
    171161       1, 1, 1, -99,32, "inst(X)", t_ops, t_wrt)
    172162! psrf2
    173   CALL histdef(fileid, "psrf2", " ", " ",iim, jj_nb, nhoriid, &
     163  CALL histdef(fileid, "psrf2", " ", " ",nbp_lon, jj_nb, nhoriid, &
    174164       1, 1, 1, -99, 32, "inst(X)", t_ops, t_wrt)
    175165! psrf3
    176   CALL histdef(fileid, "psrf3", " ", " ",iim, jj_nb, nhoriid, &
     166  CALL histdef(fileid, "psrf3", " ", " ",nbp_lon, jj_nb, nhoriid, &
    177167       1, 1, 1, -99, 32, "inst(X)", t_ops, t_wrt)
    178168! psrf4
    179   CALL histdef(fileid, "psrf4", " ", " ", iim, jj_nb, nhoriid, &
     169  CALL histdef(fileid, "psrf4", " ", " ", nbp_lon, jj_nb, nhoriid, &
    180170       1, 1, 1, -99,32, "inst(X)", t_ops, t_wrt)
    181171! sh
    182   CALL histdef(fileid, 'sh', '', '', iim, jj_nb, nhoriid, &
    183        llm, 1, llm, zvertiid, 32, 'inst(X)', t_ops, t_wrt)
     172  CALL histdef(fileid, 'sh', '', '', nbp_lon, jj_nb, nhoriid, &
     173       nbp_lev, 1, nbp_lev, zvertiid, 32, 'inst(X)', t_ops, t_wrt)
    184174! da
    185   CALL histdef(fileid, 'da', '', '', iim, jj_nb, nhoriid, &
    186        llm, 1, llm, zvertiid, 32, 'inst(X)', t_ops, t_wrt)
     175  CALL histdef(fileid, 'da', '', '', nbp_lon, jj_nb, nhoriid, &
     176       nbp_lev, 1, nbp_lev, zvertiid, 32, 'inst(X)', t_ops, t_wrt)
    187177! mp
    188   CALL histdef(fileid, 'mp', '', '', iim, jj_nb, nhoriid, &
    189        llm, 1, llm, zvertiid, 32, 'inst(X)', t_ops, t_wrt)
     178  CALL histdef(fileid, 'mp', '', '', nbp_lon, jj_nb, nhoriid, &
     179       nbp_lev, 1, nbp_lev, zvertiid, 32, 'inst(X)', t_ops, t_wrt)
    190180! upwd
    191   CALL histdef(fileid, 'upwd', '', '', iim, jj_nb, nhoriid, &
    192        llm, 1, llm, zvertiid, 32, 'inst(X)', t_ops, t_wrt)
     181  CALL histdef(fileid, 'upwd', '', '', nbp_lon, jj_nb, nhoriid, &
     182       nbp_lev, 1, nbp_lev, zvertiid, 32, 'inst(X)', t_ops, t_wrt)
    193183! dnwd
    194   CALL histdef(fileid, 'dnwd', '', '', iim, jj_nb, nhoriid, &
    195        llm, 1, llm, zvertiid, 32, 'inst(X)', t_ops, t_wrt)
     184  CALL histdef(fileid, 'dnwd', '', '', nbp_lon, jj_nb, nhoriid, &
     185       nbp_lev, 1, nbp_lev, zvertiid, 32, 'inst(X)', t_ops, t_wrt)
    196186
    197187! phi
    198   DO k=1,llm
     188  DO k=1,nbp_lev
    199189     IF (k<10) THEN
    200190        WRITE(nvar,'(i1)') k
     
    206196     nvar='phi_lev'//trim(nvar)
    207197     
    208      CALL histdef(fileid, nvar, '', '', iim, jj_nb, nhoriid, &
    209           llm, 1, llm, zvertiid, 32, 'inst(X)', t_ops, t_wrt)
     198     CALL histdef(fileid, nvar, '', '', nbp_lon, jj_nb, nhoriid, &
     199          nbp_lev, 1, nbp_lev, zvertiid, 32, 'inst(X)', t_ops, t_wrt)
    210200  END DO
    211201
Note: See TracChangeset for help on using the changeset viewer.