Changeset 2600 for LMDZ5/trunk/libf/dyn3d_common
- Timestamp:
- Jul 23, 2016, 7:45:38 AM (8 years ago)
- Location:
- LMDZ5/trunk/libf/dyn3d_common
- Files:
-
- 33 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/trunk/libf/dyn3d_common/adaptdt.F
r2597 r2600 9 9 IMPLICIT NONE 10 10 11 #include "dimensions.h" 12 c#include "paramr2.h" 13 #include "paramet.h" 14 #include "comdissip.h" 15 #include "comvert.h" 16 #include "comgeom2.h" 17 #include "logic.h" 18 #include "temps.h" 19 #include "ener.h" 20 #include "description.h" 11 include "dimensions.h" 12 include "paramet.h" 13 include "comdissip.h" 14 include "comgeom2.h" 15 include "logic.h" 16 include "temps.h" 17 include "ener.h" 18 include "description.h" 21 19 22 20 c---------------------------------------------------------- -
LMDZ5/trunk/libf/dyn3d_common/advn.F
r2597 r2600 17 17 IMPLICIT NONE 18 18 c 19 #include "dimensions.h" 20 #include "paramet.h" 21 #include "logic.h" 22 #include "comvert.h" 23 #include "comgeom.h" 24 #include "iniprint.h" 19 include "dimensions.h" 20 include "paramet.h" 21 include "logic.h" 22 include "comgeom.h" 23 include "iniprint.h" 25 24 26 25 c … … 483 482 IMPLICIT NONE 484 483 c 485 #include "dimensions.h" 486 #include "paramet.h" 487 #include "logic.h" 488 #include "comvert.h" 489 #include "iniprint.h" 484 include "dimensions.h" 485 include "paramet.h" 486 include "logic.h" 487 include "iniprint.h" 490 488 c 491 489 c -
LMDZ5/trunk/libf/dyn3d_common/advx.F
r2597 r2600 18 18 C sm,s0,sx,sy,sz C 19 19 C sont les arguments de sortie pour le s-pg C 20 C 20 C C 21 21 CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC 22 22 C 23 23 C parametres principaux du modele 24 24 C 25 #include "dimensions.h" 26 #include "paramet.h" 27 #include "comvert.h" 25 include "dimensions.h" 26 include "paramet.h" 28 27 29 28 C Arguments : -
LMDZ5/trunk/libf/dyn3d_common/advxp.F
r2597 r2600 13 13 C parametres principaux du modele 14 14 C 15 #include "dimensions.h" 16 #include "paramet.h" 17 #include "comvert.h" 15 include "dimensions.h" 16 include "paramet.h" 18 17 19 18 INTEGER ntra … … 102 101 c IF (S0(i,j,l,ntra) .lt. 0. ) THEN 103 102 c PRINT*,'S0(',i,j,l,')=',S0(i,j,l,ntra) 104 c 103 c print*, 'SSX(',i,j,l,')=',SSX(i,j,l,ntra) 105 104 c print*, 'SY(',i,j,l,')=',SY(i,j,l,ntra) 106 105 c print*, 'SZ(',i,j,l,')=',SZ(i,j,l,ntra) … … 119 118 DO j = 1, jjp1 120 119 DO i = 1, iim 121 120 sqi = sqi + S0(i,j,l,ntra) 122 121 END DO 123 122 END DO … … 611 610 c DO 9999 j = 1, jjp1 612 611 c DO 9999 i = 1, iip1 613 c 612 c IF (S0(i,j,l,ntra).lt.0..and.LIMIT) THEN 614 613 c PRINT*, '-------------------' 615 c 614 c PRINT*, 'En fin de ADVXP' 616 615 c PRINT*,'S0(',i,j,l,')=',S0(i,j,l,ntra) 617 c 616 c print*, 'SSX(',i,j,l,')=',SSX(i,j,l,ntra) 618 617 c print*, 'SY(',i,j,l,')=',SY(i,j,l,ntra) 619 c 618 c print*, 'SZ(',i,j,l,')=',SZ(i,j,l,ntra) 620 619 c WRITE (*,*) 'On arrete !! - pbl en fin de ADVXP' 621 620 c STOP … … 628 627 SM(iip1,j,l) = SM(1,j,l) 629 628 S0(iip1,j,l,ntra) = S0(1,j,l,ntra) 630 631 632 629 SSX(iip1,j,l,ntra) = SSX(1,j,l,ntra) 630 SY(iip1,j,l,ntra) = SY(1,j,l,ntra) 631 SZ(iip1,j,l,ntra) = SZ(1,j,l,ntra) 633 632 END DO 634 633 END DO -
LMDZ5/trunk/libf/dyn3d_common/advy.F
r2597 r2600 9 9 C first-order moments (SOM) advection of tracer in Y direction C 10 10 C C 11 C Source : Pascal Simon ( Meteo, CNRM ) 12 C Adaptation : A.A. (LGGE) 11 C Source : Pascal Simon ( Meteo, CNRM ) C 12 C Adaptation : A.A. (LGGE) C 13 13 C Derniere Modif : 15/12/94 LAST 14 C 15 C sont les arguments d'entree pour le s-pg 16 C 17 C argument de sortie du s-pg 18 C 14 C C 15 C sont les arguments d'entree pour le s-pg C 16 C C 17 C argument de sortie du s-pg C 18 C C 19 19 CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC 20 20 CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC … … 26 26 C 27 27 C 28 #include "dimensions.h" 29 #include "paramet.h" 30 #include "comvert.h" 31 #include "comgeom2.h" 28 include "dimensions.h" 29 include "paramet.h" 30 include "comgeom2.h" 32 31 33 32 C Arguments : -
LMDZ5/trunk/libf/dyn3d_common/advyp.F
r2597 r2600 11 11 CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC 12 12 C C 13 C Source : Pascal Simon ( Meteo, CNRM ) 14 C Adaptation : A.A. (LGGE) 13 C Source : Pascal Simon ( Meteo, CNRM ) C 14 C Adaptation : A.A. (LGGE) C 15 15 C Derniere Modif : 19/10/95 LAST 16 C 17 C sont les arguments d'entree pour le s-pg 18 C 19 C argument de sortie du s-pg 20 C 16 C C 17 C sont les arguments d'entree pour le s-pg C 18 C C 19 C argument de sortie du s-pg C 20 C C 21 21 CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC 22 22 CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC … … 28 28 C 29 29 C 30 #include "dimensions.h" 31 #include "paramet.h" 32 #include "comvert.h" 33 #include "comgeom.h" 30 include "dimensions.h" 31 include "paramet.h" 32 include "comgeom.h" 34 33 35 34 C Arguments : -
LMDZ5/trunk/libf/dyn3d_common/advz.F
r2597 r2600 16 16 C C 17 17 C dq est l'argument de sortie pour le s-pg C 18 C 18 C C 19 19 CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC 20 20 C 21 21 C parametres principaux du modele 22 22 C 23 #include "dimensions.h" 24 #include "paramet.h" 25 #include "comvert.h" 23 include "dimensions.h" 24 include "paramet.h" 26 25 27 26 C #include "traceur.h" -
LMDZ5/trunk/libf/dyn3d_common/advzp.F
r2597 r2600 31 31 C parametres principaux du modele 32 32 C 33 #include "dimensions.h" 34 #include "paramet.h" 35 #include "comvert.h" 36 #include "comgeom.h" 33 include "dimensions.h" 34 include "paramet.h" 35 include "comgeom.h" 37 36 C 38 37 C Arguments : … … 355 354 DO j = 1,jjp1 356 355 SM(iip1,j,l) = SM(1,j,l) 357 356 S0(iip1,j,l,ntra) = S0(1,j,l,ntra) 358 357 SSX(iip1,j,l,ntra) = SSX(1,j,l,ntra) 359 358 SY(iip1,j,l,ntra) = SY(1,j,l,ntra) 360 359 SZ(iip1,j,l,ntra) = SZ(1,j,l,ntra) 361 360 ENDDO 362 361 ENDDO 363 c 362 c C------------------------------------------------------------- 364 363 C *** Test : diag de la qqtite totale de tarceur 365 364 C dans l'atmosphere avant l'advection en z -
LMDZ5/trunk/libf/dyn3d_common/caldyn0.F90
r2597 r2600 7 7 !------------------------------------------------------------------------------- 8 8 USE control_mod, ONLY: resetvarc 9 USE comvert_mod, ONLY: ap, bp 9 10 IMPLICIT NONE 10 11 include "dimensions.h" 11 12 include "paramet.h" 12 include "comvert.h"13 13 include "comgeom.h" 14 14 !=============================================================================== -
LMDZ5/trunk/libf/dyn3d_common/comvert_mod.F90
r2599 r2600 2 2 ! $Id$ 3 3 ! 4 !----------------------------------------------------------------------- 5 ! INCLUDE 'comvert.h' 4 MODULE comvert_mod 6 5 7 COMMON/comvertr/ap(llm+1),bp(llm+1),presnivs(llm),dpres(llm), & 8 & pa,preff,nivsigs(llm),nivsig(llm+1), & 9 & aps(llm),bps(llm),scaleheight,pseudoalt(llm) 6 IMPLICIT NONE 10 7 11 common/comverti/disvert_type, pressure_exner 8 INCLUDE "dimensions.h" 12 9 13 real ap ! hybrid pressure contribution at interlayers 14 real bp ! hybrid sigma contribution at interlayer 15 real presnivs ! (reference) pressure at mid-layers 16 real dpres 17 real pa ! reference pressure (Pa) at which hybrid coordinates 18 ! become purely pressure 19 real preff ! reference surface pressure (Pa) 20 real nivsigs 21 real nivsig 22 real aps ! hybrid pressure contribution at mid-layers 23 real bps ! hybrid sigma contribution at mid-layers 24 real scaleheight ! atmospheric (reference) scale height (km) 25 real pseudoalt ! pseudo-altitude of model levels (km), based on presnivs(), 10 REAL ap(llm+1) ! hybrid pressure contribution at interlayers 11 REAL bp (llm+1) ! hybrid sigma contribution at interlayer 12 REAL presnivs(llm) ! (reference) pressure at mid-layers 13 REAL dpres(llm) 14 REAL sig(llm+1) 15 REAL ds(llm) 16 REAL pa ! reference pressure (Pa) at which hybrid coordinates 17 ! become purely pressure (more or less) 18 REAL preff ! reference surface pressure (Pa) 19 REAL nivsigs(llm) 20 REAL nivsig(llm+1) 21 REAL aps(llm) ! hybrid pressure contribution at mid-layers 22 REAL bps(llm) ! hybrid sigma contribution at mid-layers 23 REAL scaleheight ! atmospheric (reference) scale height (km) 24 REAL pseudoalt(llm) ! pseudo-altitude of model levels (km), based on presnivs(), 26 25 ! preff and scaleheight 27 26 28 integerdisvert_type ! type of vertical discretization:29 30 31 32 27 INTEGER disvert_type ! type of vertical discretization: 28 ! 1: Earth (default for planet_type==earth), 29 ! automatic generation 30 ! 2: Planets (default for planet_type!=earth), 31 ! using 'z2sig.def' (or 'esasig.def) file 33 32 34 logicalpressure_exner33 LOGICAL pressure_exner 35 34 ! compute pressure inside layers using Exner function, else use mean 36 35 ! of pressure values at interfaces 37 36 38 !----------------------------------------------------------------------- 37 END MODULE comvert_mod -
LMDZ5/trunk/libf/dyn3d_common/conf_planete.F90
r2597 r2600 12 12 USE comconst_mod, ONLY: pi, g, molmass, kappa, cpp, omeg, rad, & 13 13 year_day, daylen, daysec, ihf 14 USE comvert_mod, ONLY: preff, pa 14 15 IMPLICIT NONE 15 16 ! … … 17 18 ! Declarations : 18 19 ! -------------- 19 #include "dimensions.h" 20 #include "comvert.h" 20 21 21 ! 22 22 ! local: -
LMDZ5/trunk/libf/dyn3d_common/disvert.F90
r2597 r2600 10 10 use new_unit_m, only: new_unit 11 11 use assert_m, only: assert 12 USE comvert_mod, ONLY: ap, bp, nivsigs, nivsig, dpres, presnivs, & 13 pa, preff, scaleheight 12 14 13 15 IMPLICIT NONE … … 15 17 include "dimensions.h" 16 18 include "paramet.h" 17 include "comvert.h"18 19 include "iniprint.h" 19 20 include "logic.h" … … 23 24 ! Triggered by the levels number llm. 24 25 !------------------------------------------------------------------------------- 25 ! Read in "comvert .h":26 ! Read in "comvert_mod": 26 27 27 28 ! pa !--- vertical coordinate is close to a PRESSURE COORDINATE FOR P … … 29 30 30 31 ! preff !--- REFERENCE PRESSURE (101325 Pa) 31 ! Written in "comvert .h":32 ! Written in "comvert_mod": 32 33 ! ap(llm+1), bp(llm+1) !--- Ap, Bp HYBRID COEFFICIENTS AT INTERFACES 33 34 ! aps(llm), bps(llm) !--- Ap, Bp HYBRID COEFFICIENTS AT MID-LAYERS -
LMDZ5/trunk/libf/dyn3d_common/disvert_noterre.F
r2597 r2600 12 12 use ioipsl_getincom 13 13 #endif 14 USE comvert_mod, ONLY: ap,bp,aps,bps,presnivs,pseudoalt, 15 & nivsig,nivsigs,pa,preff,scaleheight 14 16 USE comconst_mod, ONLY: kappa 15 17 16 18 IMPLICIT NONE 17 19 18 #include "dimensions.h" 19 #include "paramet.h" 20 #include "comvert.h" 21 #include "logic.h" 22 #include "iniprint.h" 20 include "dimensions.h" 21 include "paramet.h" 22 include "logic.h" 23 include "iniprint.h" 23 24 c 24 25 c======================================================================= -
LMDZ5/trunk/libf/dyn3d_common/exner_hyb_m.F90
r2598 r2600 34 34 ! 35 35 USE comconst_mod, ONLY: jmp1, cpp, kappa, r 36 USE comvert_mod, ONLY: preff 37 36 38 IMPLICIT NONE 37 39 … … 39 41 include "paramet.h" 40 42 include "comgeom.h" 41 include "comvert.h"42 43 43 44 INTEGER ngrid -
LMDZ5/trunk/libf/dyn3d_common/exner_milieu_m.F90
r2598 r2600 31 31 ! 32 32 USE comconst_mod, ONLY: jmp1, cpp, kappa, r 33 USE comvert_mod, ONLY: preff 34 33 35 IMPLICIT NONE 34 36 … … 36 38 include "paramet.h" 37 39 include "comgeom.h" 38 include "comvert.h"39 40 40 41 INTEGER ngrid -
LMDZ5/trunk/libf/dyn3d_common/geopot.F
r1945 r2600 27 27 c ------------- 28 28 29 #include "dimensions.h" 30 #include "paramet.h" 31 #include "comvert.h" 29 include "dimensions.h" 30 include "paramet.h" 32 31 33 32 c Arguments: -
LMDZ5/trunk/libf/dyn3d_common/grilles_gcm_netcdf_sub.F90
r2598 r2600 10 10 11 11 USE comconst_mod, ONLY: cpp, kappa, g, omeg, daysec, rad, pi 12 USE comvert_mod, ONLY: presnivs, preff, pa 13 12 14 IMPLICIT NONE 13 15 … … 15 17 INCLUDE "paramet.h" 16 18 INCLUDE "comgeom.h" 17 INCLUDE "comvert.h"18 19 INCLUDE "netcdf.inc" 19 20 -
LMDZ5/trunk/libf/dyn3d_common/iniconst.F90
r2597 r2600 13 13 USE comconst_mod, ONLY: im, imp1, jm, jmp1, lllm, lllmm1, lllmp1, & 14 14 unsim, pi, r, kappa, cpp, dtvr, dtphys 15 USE comvert_mod, ONLY: disvert_type, pressure_exner 15 16 16 17 IMPLICIT NONE … … 24 25 include "paramet.h" 25 26 include "temps.h" 26 include "comvert.h"27 27 include "iniprint.h" 28 28 -
LMDZ5/trunk/libf/dyn3d_common/inidissip.F90
r2597 r2600 14 14 USE comconst_mod, ONLY: dissip_deltaz, dissip_factz, dissip_zref, & 15 15 dtdiss, dtvr, rad 16 USE comvert_mod, ONLY: preff, presnivs 16 17 17 18 IMPLICIT NONE … … 19 20 include "paramet.h" 20 21 include "comdissipn.h" 21 include "comvert.h"22 22 include "logic.h" 23 23 include "iniprint.h" -
LMDZ5/trunk/libf/dyn3d_common/initdynav.F90
r2598 r2600 10 10 dynhistave_file,dynhistvave_file,dynhistuave_file 11 11 USE comconst_mod, ONLY: pi 12 USE comvert_mod, ONLY: presnivs 12 13 implicit none 13 14 … … 35 36 include "dimensions.h" 36 37 include "paramet.h" 37 include "comvert.h"38 38 include "comgeom.h" 39 39 include "temps.h" -
LMDZ5/trunk/libf/dyn3d_common/initfluxsto.F
r2598 r2600 10 10 #endif 11 11 USE comconst_mod, ONLY: pi 12 USE comvert_mod, ONLY: nivsigs 12 13 implicit none 13 14 … … 41 42 include "dimensions.h" 42 43 include "paramet.h" 43 include "comvert.h"44 44 include "comgeom.h" 45 45 include "temps.h" … … 85 85 CALL ymds2ju(zan, 1, idayref, 0.0, zjulian) 86 86 tau0 = itau_dyn 87 88 87 88 do jj = 1, jjp1 89 89 do ii = 1, iip1 90 90 rlong(ii,jj) = rlonu(ii) * 180. / pi … … 112 112 . 1, iip1, 1, jjm, 113 113 . tau0, zjulian, tstep, vhoriid, filevid) 114 115 114 115 rl(1,1) = 1. 116 116 call histbeg('defstoke.nc', 1, rl, 1, rl, 117 117 . 1, 1, 1, 1, … … 130 130 call histhori(fileid, iip1, rlong, jjp1, rlat, 'scalar', 131 131 . 'Grille points scalaires', thoriid) 132 132 133 133 C 134 134 C Appel a histvert pour la grille verticale … … 149 149 C 150 150 C Appels a histdef pour la definition des variables a sauvegarder 151 152 151 152 CALL histdef(fileid, "phis", "Surface geop. height", "-", 153 153 . iip1,jjp1,thoriid, 1,1,1, -99, 32, 154 154 . "once", t_ops, t_wrt) … … 157 157 . iip1,jjp1,thoriid, 1,1,1, -99, 32, 158 158 . "once", t_ops, t_wrt) 159 160 159 160 CALL histdef(filedid, "dtvr", "tps dyn", "s", 161 161 . 1,1,dhoriid, 1,1,1, -99, 32, 162 162 . "once", t_ops, t_wrt) … … 222 222 call histsync(filedid) 223 223 endif 224 224 225 225 #else 226 226 ! tell the user this routine should be run with ioipsl -
LMDZ5/trunk/libf/dyn3d_common/inithist.F
r2598 r2600 11 11 & dynhist_file,dynhistv_file,dynhistu_file 12 12 USE comconst_mod, ONLY: pi 13 USE comvert_mod, ONLY: presnivs 13 14 implicit none 14 15 … … 40 41 include "dimensions.h" 41 42 include "paramet.h" 42 include "comvert.h"43 43 include "comgeom.h" 44 44 include "temps.h" -
LMDZ5/trunk/libf/dyn3d_common/interpost.F
r2597 r2600 9 9 include "dimensions.h" 10 10 include "paramet.h" 11 include "comvert.h"12 11 include "comgeom2.h" 13 12 -
LMDZ5/trunk/libf/dyn3d_common/interpre.F
r2597 r2600 7 7 8 8 USE comconst_mod, ONLY: g 9 USE comvert_mod, ONLY: ap, bp 9 10 10 11 implicit none … … 13 14 include "paramet.h" 14 15 include "comdissip.h" 15 include "comvert.h"16 16 include "comgeom2.h" 17 17 include "logic.h" -
LMDZ5/trunk/libf/dyn3d_common/limx.F
r2597 r2600 18 18 include "paramet.h" 19 19 include "logic.h" 20 include "comvert.h"21 20 include "comgeom.h" 22 21 c -
LMDZ5/trunk/libf/dyn3d_common/limy.F
r2597 r2600 20 20 include "paramet.h" 21 21 include "logic.h" 22 include "comvert.h"23 22 include "comgeom.h" 24 23 c -
LMDZ5/trunk/libf/dyn3d_common/limz.F
r2597 r2600 18 18 include "paramet.h" 19 19 include "logic.h" 20 include "comvert.h"21 20 include "comgeom.h" 22 21 c -
LMDZ5/trunk/libf/dyn3d_common/pentes_ini.F
r2597 r2600 27 27 include "dimensions.h" 28 28 include "paramet.h" 29 include "comvert.h"30 29 include "comgeom2.h" 31 30 … … 439 438 440 439 DO l = 1,llm 441 442 440 DO j = 1,jjp1 441 DO i = 1,iip1 443 442 IF (q(i,j,l,0).lt.0.) THEN 444 443 c PRINT*,'------------ BIP-----------' … … 447 446 c PRINT*,'QY(',i,j,l,')=',q(i,j,l,2) 448 447 c PRINT*,'QZ(',i,j,l,')=',q(i,j,l,3) 449 c 448 c PRINT*,' PBL EN SORTIE DE PENTES' 450 449 q(i,j,l,0)=0. 451 450 c STOP -
LMDZ5/trunk/libf/dyn3d_common/prather.F
r2597 r2600 24 24 include "dimensions.h" 25 25 include "paramet.h" 26 include "comvert.h"27 26 include "comgeom2.h" 28 27 -
LMDZ5/trunk/libf/dyn3d_common/sortvarc.F
r2597 r2600 28 28 INCLUDE "dimensions.h" 29 29 INCLUDE "paramet.h" 30 INCLUDE "comvert.h"31 30 INCLUDE "comgeom.h" 32 31 INCLUDE "ener.h" -
LMDZ5/trunk/libf/dyn3d_common/traceurpole.F
r2597 r2600 9 9 include "paramet.h" 10 10 include "comdissip.h" 11 include "comvert.h"12 11 include "comgeom2.h" 13 12 include "logic.h" -
LMDZ5/trunk/libf/dyn3d_common/vitvert.F90
r2336 r2600 5 5 !------------------------------------------------------------------------------- 6 6 ! Purpose: Compute vertical speed at sigma levels. 7 USE comvert_mod, ONLY: bp 7 8 IMPLICIT NONE 8 9 include "dimensions.h" 9 10 include "paramet.h" 10 include "comvert.h"11 11 !=============================================================================== 12 12 ! Arguments: -
LMDZ5/trunk/libf/dyn3d_common/writedynav.F90
r2598 r2600 32 32 include "dimensions.h" 33 33 include "paramet.h" 34 include "comvert.h"35 34 include "comgeom.h" 36 35 include "temps.h" -
LMDZ5/trunk/libf/dyn3d_common/writehist.F
r2598 r2600 35 35 include "dimensions.h" 36 36 include "paramet.h" 37 include "comvert.h"38 37 include "comgeom.h" 39 38 include "temps.h"
Note: See TracChangeset
for help on using the changeset viewer.