Changeset 814 for trunk/LMDZ.TITAN/libf


Ignore:
Timestamp:
Oct 23, 2012, 7:07:54 PM (12 years ago)
Author:
slebonnois
Message:

SL: corrections de bugs pour Titan, + suppression de la dependance circulaire dans mod_grid_phy_lmdz.F90, + petite inversion sur la ligne 101 de create_make_gcm pour que disvert compile du premier coup.

Location:
trunk/LMDZ.TITAN/libf/phytitan
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LMDZ.TITAN/libf/phytitan/mod_grid_phy_lmdz.F90

    r102 r814  
    33!
    44MODULE mod_grid_phy_lmdz
     5
     6  PUBLIC
     7  PRIVATE :: grid1dTo2d_glo_igen, grid1dTo2d_glo_rgen, grid1dTo2d_glo_lgen, &
     8             grid2dTo1d_glo_igen, grid2dTo1d_glo_rgen, grid2dTo1d_glo_lgen
     9
    510  INTEGER,SAVE :: nbp_lon  ! == iim
    611  INTEGER,SAVE :: nbp_lat  ! == jjmp1
    … …  
    271276  END SUBROUTINE grid2dTo1d_glo_l3
    272277
    273 END MODULE mod_grid_phy_lmdz
    274 
    275 
    276  
     278!----------------------------------------------------------------
     279!  fonctions generiques (privees)
     280!----------------------------------------------------------------
    277281  SUBROUTINE grid1dTo2d_glo_igen(VarIn,VarOut,dimsize)
    278     USE mod_grid_phy_lmdz
    279282    IMPLICIT NONE
    280283
    … …  
    311314
    312315  SUBROUTINE grid1dTo2d_glo_rgen(VarIn,VarOut,dimsize)
    313     USE mod_grid_phy_lmdz
    314316    IMPLICIT NONE
    315317
    … …  
    345347
    346348  SUBROUTINE grid1dTo2d_glo_lgen(VarIn,VarOut,dimsize)
    347     USE mod_grid_phy_lmdz
    348349    IMPLICIT NONE
    349350   
    … …  
    379380 
    380381  SUBROUTINE grid2dTo1d_glo_igen(VarIn,VarOut,dimsize)
    381     USE mod_grid_phy_lmdz
    382382    IMPLICIT NONE
    383383
    … …  
    402402 
    403403  SUBROUTINE grid2dTo1d_glo_rgen(VarIn,VarOut,dimsize)
    404     USE mod_grid_phy_lmdz
    405404    IMPLICIT NONE
    406405
    … …  
    425424   
    426425  SUBROUTINE grid2dTo1d_glo_lgen(VarIn,VarOut,dimsize)
    427     USE mod_grid_phy_lmdz
    428426    IMPLICIT NONE
    429427
    … …  
    446444   
    447445  END SUBROUTINE grid2dTo1d_glo_lgen   
     446
     447END MODULE mod_grid_phy_lmdz

  • trunk/LMDZ.TITAN/libf/phytitan/optcv_1pt_3.F

    r808 r814  
    7373      real   rcdb(NLAYER), xfrb(NLAYER,4)
    7474
    75       save qf1,qf2,qf3,qf4,qm1,qm2,qm3,qm4,qc1,qc2,qc3,qc4
     75      save qf1,qf2,qf3,qf4,qm1,qm2,qm3,qm4
    7676
    7777

  • trunk/LMDZ.TITAN/libf/phytitan/phyetat0.F

    r808 r814  
    1515c======================================================================
    1616      use dimphy
     17      use control_mod
    1718      IMPLICIT none
    1819#include "dimensions.h"

  • trunk/LMDZ.TITAN/libf/phytitan/snuages3D.F

    r474 r814  
    242242c        Les precipitations sont comptees positivement. (ET ON NE PREND QUE DES VALEURS POSITIVES !)
    243243
    244          precip(ihor,1)=AMAX1(-dice1/rhoi_ch4,0)     ! m3/m2 = m :)
    245          precip(ihor,2)=AMAX1(-dice2/rhoi_c2h6,0)
    246          precip(ihor,3)=AMAX1(-dice3/rhoi_c2h2,0)
    247          precip(ihor,4)=AMAX1(-dice4/rhol,0)
     244         precip(ihor,1)=AMAX1(-dice1/rhoi_ch4,0.)     ! m3/m2 = m :)
     245         precip(ihor,2)=AMAX1(-dice2/rhoi_c2h6,0.)
     246         precip(ihor,3)=AMAX1(-dice3/rhoi_c2h2,0.)
     247         precip(ihor,4)=AMAX1(-dice4/rhol,0.)
    248248
    249249         do i=1,nz

  • trunk/LMDZ.TITAN/libf/phytitan/yamada4.F

    r808 r814  
    1010      IMPLICIT NONE
    1111#include "dimensions.h"
     12#include "YOMCST.h"
    1213c.......................................................................
    1314c
    … …  
    435436                                                          do ig=1,ngrid
    436437      coriol(ig)=1.e-4*86400/RDAY  !! scaling... should be checked
    437       pblhmin(ig)=0.07*ustar(ig)/max(abs(coriol(ig)),2.546e-5*86400/RDAY)
     438      pblhmin(ig)=0.07*ustar(ig)/
     439     .               max(abs(coriol(ig)),2.546e-5*86400/RDAY)
    438440                                                          enddo
    439441c     if (first) then
Note: See TracChangeset for help on using the changeset viewer.