Changeset 2597 for LMDZ5/trunk/libf/dyn3dmem
- Timestamp:
- Jul 22, 2016, 8:44:47 AM (9 years ago)
- Location:
- LMDZ5/trunk/libf/dyn3dmem
- Files:
-
- 33 edited
-
addfi_loc.F (modified) (1 diff)
-
advect_new_loc.F (modified) (3 diffs)
-
advtrac_loc.F (modified) (1 diff)
-
bilan_dyn_loc.F (modified) (1 diff)
-
caladvtrac_loc.F (modified) (2 diffs)
-
caldyn_loc.F (modified) (1 diff)
-
call_calfis_mod.F90 (modified) (1 diff)
-
conf_gcm.F90 (modified) (2 diffs)
-
dissip_loc.F (modified) (2 diffs)
-
dynetat0_loc.f90 (modified) (1 diff)
-
dynredem_loc.F90 (modified) (1 diff)
-
exner_hyb_loc_m.F90 (modified) (1 diff)
-
exner_milieu_loc_m.F90 (modified) (1 diff)
-
friction_loc.F (modified) (2 diffs)
-
gcm.F90 (modified) (2 diffs)
-
groupe_loc.F (modified) (2 diffs)
-
groupeun_loc.F (modified) (2 diffs)
-
guide_loc_mod.F90 (modified) (15 diffs)
-
iniacademic_loc.F90 (modified) (2 diffs)
-
initdynav_loc.F (modified) (2 diffs)
-
initfluxsto_p.F (modified) (3 diffs)
-
inithist_loc.F (modified) (2 diffs)
-
integrd_loc.F (modified) (4 diffs)
-
leapfrog_loc.F (modified) (2 diffs)
-
massbarxy_loc.F90 (modified) (1 diff)
-
massdair_loc.F (modified) (1 diff)
-
sw_case_williamson91_6_loc.F (modified) (2 diffs)
-
top_bound_loc.F (modified) (3 diffs)
-
vlsplt_loc.F (modified) (3 diffs)
-
vlspltgen_loc.F (modified) (20 diffs)
-
vlspltqs_loc.F (modified) (2 diffs)
-
writedynav_loc.F (modified) (2 diffs)
-
writehist_loc.F (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/trunk/libf/dyn3dmem/addfi_loc.F
r1987 r2597 46 46 c ------------------ 47 47 c 48 #include "dimensions.h" 49 #include "paramet.h" 50 #include "comconst.h" 51 #include "comgeom.h" 52 #include "serre.h" 48 include "dimensions.h" 49 include "paramet.h" 50 include "comgeom.h" 51 include "serre.h" 53 52 c 54 53 c Arguments : -
LMDZ5/trunk/libf/dyn3dmem/advect_new_loc.F
r1907 r2597 7 7 USE write_field_loc 8 8 USE advect_new_mod 9 USE comconst_mod, ONLY: daysec 9 10 IMPLICIT NONE 10 11 c======================================================================= … … 27 28 c ------------- 28 29 29 #include "dimensions.h" 30 #include "paramet.h" 31 #include "comconst.h" 32 #include "comvert.h" 33 #include "comgeom.h" 34 #include "logic.h" 35 #include "ener.h" 30 include "dimensions.h" 31 include "paramet.h" 32 include "comvert.h" 33 include "comgeom.h" 34 include "logic.h" 35 include "ener.h" 36 36 37 37 c Arguments: … … 122 122 123 123 uav(ij,l)=0.25*(ucov(ij,l)+ucov(ij-iip1,l)) 124 . 124 . +0.25*(ucov(ij+iip1,l)+ucov(ij,l)) 125 125 ENDDO 126 126 -
LMDZ5/trunk/libf/dyn3dmem/advtrac_loc.F
r2286 r2597 27 27 USE control_mod, ONLY: iapp_tracvl, day_step, planet_type 28 28 USE advtrac_mod, ONLY: finmasse 29 USE comconst_mod, ONLY: dtvr 29 30 IMPLICIT NONE 30 31 c 31 #include "dimensions.h" 32 #include "paramet.h" 33 #include "comconst.h" 34 #include "comvert.h" 35 #include "comdissip.h" 36 #include "comgeom2.h" 37 #include "logic.h" 38 #include "temps.h" 39 #include "ener.h" 40 #include "description.h" 32 include "dimensions.h" 33 include "paramet.h" 34 include "comvert.h" 35 include "comdissip.h" 36 include "comgeom2.h" 37 include "logic.h" 38 include "temps.h" 39 include "ener.h" 40 include "description.h" 41 41 42 42 c------------------------------------------------------------------- -
LMDZ5/trunk/libf/dyn3dmem/bilan_dyn_loc.F
r2475 r2597 17 17 use misc_mod 18 18 USE write_field_loc 19 USE comconst_mod, ONLY: cpp, pi 19 20 IMPLICIT NONE 20 21 21 #include "dimensions.h" 22 #include "paramet.h" 23 #include "comconst.h" 24 #include "comvert.h" 25 #include "comgeom2.h" 26 #include "temps.h" 27 #include "iniprint.h" 22 include "dimensions.h" 23 include "paramet.h" 24 include "comvert.h" 25 include "comgeom2.h" 26 include "temps.h" 27 include "iniprint.h" 28 28 29 29 c==================================================================== -
LMDZ5/trunk/libf/dyn3dmem/caladvtrac_loc.F
r2286 r2597 29 29 30 30 31 #include "dimensions.h" 32 #include "paramet.h" 33 #include "comconst.h" 31 include "dimensions.h" 32 include "paramet.h" 34 33 35 34 c Arguments: … … 210 209 call resume_timer(timer_caldyn) 211 210 c$OMP END MASTER 212 c$OMP BARRIER 211 c$OMP BARRIER 213 212 iadvtr=0 214 213 ENDIF ! if iadvtr.EQ.iapp_tracvl -
LMDZ5/trunk/libf/dyn3dmem/caldyn_loc.F
r1987 r2597 31 31 ! ---------------- 32 32 33 #include "dimensions.h" 34 #include "paramet.h" 35 #include "comconst.h" 36 #include "comvert.h" 37 #include "comgeom.h" 33 include "dimensions.h" 34 include "paramet.h" 35 include "comvert.h" 36 include "comgeom.h" 38 37 39 38 ! Arguments: -
LMDZ5/trunk/libf/dyn3dmem/call_calfis_mod.F90
r2375 r2597 82 82 USE write_field_loc 83 83 USE write_field 84 USE comconst_mod, ONLY: dtphys 84 85 IMPLICIT NONE 85 INCLUDE "comconst.h"86 86 INCLUDE "comvert.h" 87 87 INCLUDE "logic.h" -
LMDZ5/trunk/libf/dyn3dmem/conf_gcm.F90
r2444 r2597 17 17 USE infotrac, ONLY : type_trac 18 18 use assert_m, only: assert 19 USE comconst_mod, ONLY: dissip_deltaz, dissip_factz, dissip_zref, & 20 iflag_top_bound, mode_top_bound, tau_top_bound, & 21 ngroup 19 22 20 23 IMPLICIT NONE … … 39 42 include "comdissnew.h" 40 43 include "temps.h" 41 include "comconst.h"42 44 include "iniprint.h" 43 45 -
LMDZ5/trunk/libf/dyn3dmem/dissip_loc.F
r1987 r2597 7 7 USE write_field_loc 8 8 USE dissip_mod, ONLY: dissip_allocate 9 USE comconst_mod, ONLY: dtdiss 9 10 IMPLICIT NONE 10 11 … … 28 29 c ------------- 29 30 30 #include "dimensions.h" 31 #include "paramet.h" 32 #include "comconst.h" 33 #include "comgeom.h" 34 #include "comdissnew.h" 35 #include "comdissipn.h" 31 include "dimensions.h" 32 include "paramet.h" 33 include "comgeom.h" 34 include "comdissnew.h" 35 include "comdissipn.h" 36 36 37 37 c Arguments: -
LMDZ5/trunk/libf/dyn3dmem/dynetat0_loc.f90
r2299 r2597 12 12 USE control_mod, ONLY: planet_type 13 13 USE assert_eq_m, ONLY: assert_eq 14 USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa, lllm, & 15 omeg, rad 14 16 IMPLICIT NONE 15 17 include "dimensions.h" 16 18 include "paramet.h" 17 19 include "temps.h" 18 include "comconst.h"19 20 include "comvert.h" 20 21 include "comgeom.h" -
LMDZ5/trunk/libf/dyn3dmem/dynredem_loc.F90
r2584 r2597 13 13 NF90_CLOSE, NF90_PUT_ATT, NF90_UNLIMITED, NF90_CLOBBER 14 14 USE dynredem_mod, ONLY: cre_var, put_var, err, modname, fil 15 USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad 15 16 IMPLICIT NONE 16 17 include "dimensions.h" 17 18 include "paramet.h" 18 include "comconst.h"19 19 include "comvert.h" 20 20 include "comgeom.h" -
LMDZ5/trunk/libf/dyn3dmem/exner_hyb_loc_m.F90
r2021 r2597 35 35 USE mod_filtreg_p 36 36 USE write_field_loc 37 USE comconst_mod, ONLY: cpp, kappa, r, jmp1 38 IMPLICIT NONE 37 39 ! 38 40 include "dimensions.h" 39 41 include "paramet.h" 40 include "comconst.h"41 42 include "comgeom.h" 42 43 include "comvert.h" -
LMDZ5/trunk/libf/dyn3dmem/exner_milieu_loc_m.F90
r2021 r2597 31 31 USE parallel_lmdz 32 32 USE mod_filtreg_p 33 USE comconst_mod, ONLY: cpp, kappa, r, jmp1 34 IMPLICIT NONE 33 35 ! 34 36 include "dimensions.h" 35 37 include "paramet.h" 36 include "comconst.h"37 38 include "comgeom.h" 38 39 include "comvert.h" -
LMDZ5/trunk/libf/dyn3dmem/friction_loc.F
r1907 r2597 12 12 USE ioipsl_getincom 13 13 #endif 14 USE comconst_mod, ONLY: pi 14 15 IMPLICIT NONE 15 16 … … 26 27 !======================================================================= 27 28 28 #include "dimensions.h" 29 #include "paramet.h" 30 #include "comgeom2.h" 31 #include "comconst.h" 32 #include "iniprint.h" 33 #include "academic.h" 29 include "dimensions.h" 30 include "paramet.h" 31 include "comgeom2.h" 32 include "iniprint.h" 33 include "academic.h" 34 34 35 35 ! arguments: -
LMDZ5/trunk/libf/dyn3dmem/gcm.F90
r2475 r2597 21 21 USE iniphysiq_mod, ONLY: iniphysiq 22 22 #endif 23 USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, r, rad 23 24 IMPLICIT NONE 24 25 … … 54 55 include "dimensions.h" 55 56 include "paramet.h" 56 include "comconst.h"57 57 include "comdissnew.h" 58 58 include "comvert.h" -
LMDZ5/trunk/libf/dyn3dmem/groupe_loc.F
r2442 r2597 3 3 USE Write_field_loc 4 4 USE groupe_mod 5 USE comconst_mod, ONLY: ngroup 5 6 implicit none 6 7 … … 16 17 c pas besoin de w en entree. 17 18 18 #include "dimensions.h" 19 #include "paramet.h" 20 #include "comconst.h" 21 #include "comgeom2.h" 22 #include "comvert.h" 19 include "dimensions.h" 20 include "paramet.h" 21 include "comgeom2.h" 22 include "comvert.h" 23 23 24 24 ! integer ngroup -
LMDZ5/trunk/libf/dyn3dmem/groupeun_loc.F
r2442 r2597 2 2 USE parallel_lmdz 3 3 USE Write_Field_p 4 USE comconst_mod, ONLY: ngroup 4 5 IMPLICIT NONE 5 6 6 #include "dimensions.h" 7 #include "paramet.h" 8 #include "comconst.h" 9 #include "comgeom2.h" 7 include "dimensions.h" 8 include "paramet.h" 9 include "comgeom2.h" 10 10 11 11 INTEGER jjmax,llmax,sb,se,jjb,jje … … 136 136 137 137 USE parallel_lmdz 138 USE comconst_mod, ONLY: ngroup 138 139 IMPLICIT NONE 139 140 140 #include "dimensions.h" 141 #include "paramet.h" 142 #include "comconst.h" 143 #include "comgeom2.h" 141 include "dimensions.h" 142 include "paramet.h" 143 include "comgeom2.h" 144 144 145 145 ! INTEGER ngroup -
LMDZ5/trunk/libf/dyn3dmem/guide_loc_mod.F90
r2263 r2597 346 346 USE control_mod 347 347 USE write_field_loc 348 USE comconst_mod, ONLY: cpp, daysec, dtvr, kappa 348 349 349 350 IMPLICIT NONE … … 351 352 INCLUDE "dimensions.h" 352 353 INCLUDE "paramet.h" 353 INCLUDE "comconst.h"354 354 INCLUDE "comvert.h" 355 355 … … 748 748 SUBROUTINE guide_zonave_u(typ,vsize,field) 749 749 750 USE comconst_mod, ONLY: pi 751 750 752 IMPLICIT NONE 751 753 … … 753 755 INCLUDE "paramet.h" 754 756 INCLUDE "comgeom.h" 755 INCLUDE "comconst.h"756 757 757 758 ! input/output variables … … 819 820 SUBROUTINE guide_zonave_v(typ,hsize,vsize,field) 820 821 822 USE comconst_mod, ONLY: pi 823 821 824 IMPLICIT NONE 822 825 … … 824 827 INCLUDE "paramet.h" 825 828 INCLUDE "comgeom.h" 826 INCLUDE "comconst.h"827 829 828 830 ! input/output variables … … 890 892 USE mod_hallo 891 893 USE Bands 894 USE comconst_mod, ONLY: cpp, kappa 892 895 IMPLICIT NONE 893 896 … … 896 899 include "comvert.h" 897 900 include "comgeom2.h" 898 include "comconst.h"899 901 900 902 REAL, DIMENSION (iip1,jjb_u:jje_u), INTENT(IN) :: psi ! Psol gcm … … 1012 1014 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK) 1013 1015 DO l=1,llm 1014 1015 1016 DO j=jjbu,jjeu 1017 DO i =1, iip1 1016 1018 pls(i,j,l)=(ap(l)+ap(l+1))/2.+psi(i,j)*(bp(l)+bp(l+1))/2. 1017 1019 ENDDO … … 1030 1032 DO l = 1, llm 1031 1033 DO j=jjbu,jjeu 1032 1033 1034 1034 DO i =1, iip1 1035 pls(i,j,l) = preff * ( pk(i,j,l)/cpp) ** unskap 1036 ENDDO 1035 1037 ENDDO 1036 1038 ENDDO … … 1302 1304 ! Calcul des nouvelles valeurs des niveaux de pression du guidage 1303 1305 IF (guide_plevs.EQ.1) THEN 1304 1305 1306 1307 !$OMP BARRIER 1308 1306 CALL Register_Hallo_u(psnat1,1,1,2,2,1,Req) 1307 CALL Register_Hallo_u(psnat2,1,1,2,2,1,Req) 1308 CALL SendRequest(Req) 1309 !$OMP BARRIER 1310 CALL WaitRequest(Req) 1309 1311 !$OMP BARRIER 1310 1312 !$OMP DO … … 1320 1322 ENDDO 1321 1323 ELSE IF (guide_plevs.EQ.2) THEN 1322 1323 1324 1325 !$OMP BARRIER 1326 1324 CALL Register_Hallo_u(pnat1,llm,1,2,2,1,Req) 1325 CALL Register_Hallo_u(pnat2,llm,1,2,2,1,Req) 1326 CALL SendRequest(Req) 1327 !$OMP BARRIER 1328 CALL WaitRequest(Req) 1327 1329 !$OMP BARRIER 1328 1330 !$OMP DO … … 1370 1372 ! Calcul des constantes de rappel alpha (=1/tau) 1371 1373 1374 use comconst_mod, only: pi 1375 1372 1376 implicit none 1373 1377 1374 1378 include "dimensions.h" 1375 1379 include "paramet.h" 1376 include "comconst.h"1377 1380 include "comgeom2.h" 1378 1381 include "serre.h" … … 2127 2130 USE parallel_lmdz 2128 2131 USE mod_hallo, ONLY : gather_field_u, gather_field_v 2132 USE comconst_mod, ONLY: pi 2129 2133 IMPLICIT NONE 2130 2134 … … 2133 2137 INCLUDE "netcdf.inc" 2134 2138 INCLUDE "comgeom2.h" 2135 INCLUDE "comconst.h"2136 2139 INCLUDE "comvert.h" 2137 2140 -
LMDZ5/trunk/libf/dyn3dmem/iniacademic_loc.F90
r2270 r2597 18 18 #endif 19 19 USE Write_Field 20 USE comconst_mod, ONLY: cpp, kappa, g, daysec, dtvr, pi, im, jm 20 21 21 22 ! Author: Frederic Hourdin original: 15/01/93 … … 31 32 include "paramet.h" 32 33 include "comvert.h" 33 include "comconst.h"34 34 include "comgeom.h" 35 35 include "academic.h" -
LMDZ5/trunk/libf/dyn3dmem/initdynav_loc.F
r2475 r2597 14 14 use com_io_dyn_mod, only : histaveid,histvaveid,histuaveid, & 15 15 & dynhistave_file,dynhistvave_file,dynhistuave_file 16 USE comconst_mod, ONLY: pi 16 17 implicit none 17 18 … … 41 42 C 42 43 C Declarations 43 #include "dimensions.h" 44 #include "paramet.h" 45 #include "comconst.h" 46 #include "comvert.h" 47 #include "comgeom.h" 48 #include "temps.h" 49 #include "ener.h" 50 #include "logic.h" 51 #include "description.h" 52 #include "serre.h" 53 #include "iniprint.h" 44 include "dimensions.h" 45 include "paramet.h" 46 include "comvert.h" 47 include "comgeom.h" 48 include "temps.h" 49 include "ener.h" 50 include "logic.h" 51 include "description.h" 52 include "serre.h" 53 include "iniprint.h" 54 54 55 55 C Arguments -
LMDZ5/trunk/libf/dyn3dmem/initfluxsto_p.F
r1907 r2597 13 13 use Write_field 14 14 use misc_mod 15 USE comconst_mod, ONLY: pi 15 16 16 17 implicit none … … 43 44 C 44 45 C Declarations 45 #include "dimensions.h" 46 #include "paramet.h" 47 #include "comconst.h" 48 #include "comvert.h" 49 #include "comgeom.h" 50 #include "temps.h" 51 #include "ener.h" 52 #include "logic.h" 53 #include "description.h" 54 #include "serre.h" 55 #include "iniprint.h" 46 include "dimensions.h" 47 include "paramet.h" 48 include "comvert.h" 49 include "comgeom.h" 50 include "temps.h" 51 include "ener.h" 52 include "logic.h" 53 include "description.h" 54 include "serre.h" 55 include "iniprint.h" 56 56 57 57 C Arguments … … 166 166 . filevid,dynv_domain_id) 167 167 168 rl(1,1) = 1. 168 rl(1,1) = 1. 169 169 170 170 if (mpi_rank==0) then -
LMDZ5/trunk/libf/dyn3dmem/inithist_loc.F
r2475 r2597 14 14 use com_io_dyn_mod, only : histid,histvid,histuid, & 15 15 & dynhist_file,dynhistv_file,dynhistu_file 16 USE comconst_mod, ONLY: pi 16 17 implicit none 17 18 … … 40 41 C 41 42 C Declarations 42 #include "dimensions.h" 43 #include "paramet.h" 44 #include "comconst.h" 45 #include "comvert.h" 46 #include "comgeom.h" 47 #include "temps.h" 48 #include "ener.h" 49 #include "logic.h" 50 #include "description.h" 51 #include "serre.h" 52 #include "iniprint.h" 43 include "dimensions.h" 44 include "paramet.h" 45 include "comvert.h" 46 include "comgeom.h" 47 include "temps.h" 48 include "ener.h" 49 include "logic.h" 50 include "description.h" 51 include "serre.h" 52 include "iniprint.h" 53 53 54 54 C Arguments -
LMDZ5/trunk/libf/dyn3dmem/integrd_loc.F
r2461 r2597 12 12 USE integrd_mod 13 13 USE infotrac, ONLY: ok_iso_verif ! ajout CRisi 14 USE comconst_mod, ONLY: pi 14 15 IMPLICIT NONE 15 16 … … 30 31 c ------------- 31 32 32 #include "dimensions.h" 33 #include "paramet.h" 34 #include "comconst.h" 35 #include "comgeom.h" 36 #include "comvert.h" 37 #include "logic.h" 38 #include "temps.h" 39 #include "serre.h" 40 #include "iniprint.h" 41 ! include 'mpif.h' 33 include "dimensions.h" 34 include "paramet.h" 35 include "comgeom.h" 36 include "comvert.h" 37 include "logic.h" 38 include "temps.h" 39 include "serre.h" 40 include "iniprint.h" 42 41 43 42 c Arguments: … … 335 334 ije=ij_end 336 335 337 336 if (planet_type.eq."earth") then 338 337 ! Earth-specific treatment of first 2 tracers (water) 339 338 c$OMP BARRIER … … 452 451 DO l = 1, llm 453 452 massem1(ijb:ije,l)=massescr(ijb:ije,l) 454 455 c$OMP END DO NOWAIT 453 ENDDO 454 c$OMP END DO NOWAIT 456 455 END IF 457 456 c$OMP BARRIER -
LMDZ5/trunk/libf/dyn3dmem/leapfrog_loc.F
r2475 r2597 32 32 use exner_hyb_loc_m, only: exner_hyb_loc 33 33 use exner_milieu_loc_m, only: exner_milieu_loc 34 USE comconst_mod, ONLY: cpp, dtvr, ihf 34 35 IMPLICIT NONE 35 36 … … 65 66 c ------------- 66 67 67 #include "dimensions.h" 68 #include "paramet.h" 69 #include "comconst.h" 70 #include "comdissnew.h" 71 #include "comvert.h" 72 #include "comgeom.h" 73 #include "logic.h" 74 #include "temps.h" 75 #include "ener.h" 76 #include "description.h" 77 #include "serre.h" 78 !#include "com_io_dyn.h" 79 #include "iniprint.h" 80 #include "academic.h" 81 ! include "mpif.h" 68 include "dimensions.h" 69 include "paramet.h" 70 include "comdissnew.h" 71 include "comvert.h" 72 include "comgeom.h" 73 include "logic.h" 74 include "temps.h" 75 include "ener.h" 76 include "description.h" 77 include "serre.h" 78 include "iniprint.h" 79 include "academic.h" 82 80 83 81 REAL,INTENT(IN) :: time_0 ! not used -
LMDZ5/trunk/libf/dyn3dmem/massbarxy_loc.F90
r2336 r2597 10 10 include "dimensions.h" 11 11 include "paramet.h" 12 include "comconst.h"13 12 include "comgeom.h" 14 13 !=============================================================================== -
LMDZ5/trunk/libf/dyn3dmem/massdair_loc.F
r1907 r2597 16 16 IMPLICIT NONE 17 17 c 18 #include "dimensions.h" 19 #include "paramet.h" 20 #include "comconst.h" 21 #include "comgeom.h" 18 include "dimensions.h" 19 include "paramet.h" 20 include "comgeom.h" 22 21 c 23 22 c ..... arguments .... -
LMDZ5/trunk/libf/dyn3dmem/sw_case_williamson91_6_loc.F
r1907 r2597 27 27 c======================================================================= 28 28 USE parallel_lmdz 29 USE comconst_mod, ONLY: cpp, omeg, rad 29 30 30 31 IMPLICIT NONE … … 33 34 c --------------- 34 35 35 #include "dimensions.h" 36 #include "paramet.h" 37 #include "comvert.h" 38 #include "comconst.h" 39 #include "comgeom.h" 40 #include "iniprint.h" 36 include "dimensions.h" 37 include "paramet.h" 38 include "comvert.h" 39 include "comgeom.h" 40 include "iniprint.h" 41 41 42 42 c Arguments: -
LMDZ5/trunk/libf/dyn3dmem/top_bound_loc.F
r1907 r2597 4 4 SUBROUTINE top_bound_loc(vcov,ucov,teta,masse,dt) 5 5 USE parallel_lmdz 6 USE comconst_mod, ONLY: iflag_top_bound, mode_top_bound, 7 & tau_top_bound 6 8 IMPLICIT NONE 7 9 c 8 #include "dimensions.h" 9 #include "paramet.h" 10 #include "comconst.h" 11 #include "comvert.h" 12 #include "comgeom2.h" 10 include "dimensions.h" 11 include "paramet.h" 12 include "comvert.h" 13 include "comgeom2.h" 13 14 14 15 … … 40 41 ! NB: top_bound sponge is only called from leapfrog if ok_strato=.true. 41 42 42 ! sponge parameters: (loaded/set in conf_gcm.F ; stored in comconst .h)43 ! sponge parameters: (loaded/set in conf_gcm.F ; stored in comconst_mod) 43 44 ! iflag_top_bound=0 for no sponge 44 45 ! iflag_top_bound=1 for sponge over 4 topmost layers … … 74 75 REAL tzon(jjb_u:jje_u,llm) 75 76 76 integer i 77 integer i 77 78 REAL,SAVE :: rdamp(llm) 78 79 real,save :: lambda(llm) ! inverse or quenching time scale (Hz) -
LMDZ5/trunk/libf/dyn3dmem/vlsplt_loc.F
r2286 r2597 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 "comconst.h" 19 include "dimensions.h" 20 include "paramet.h" 21 include "logic.h" 22 include "comvert.h" 24 23 c 25 24 c … … 417 416 USE parallel_lmdz 418 417 USE infotrac, ONLY : nqtot,nqfils,nqdesc,iqfils ! CRisi 418 USE comconst_mod, ONLY: pi 419 419 IMPLICIT NONE 420 420 c 421 #include "dimensions.h" 422 #include "paramet.h" 423 #include "logic.h" 424 #include "comvert.h" 425 #include "comconst.h" 426 #include "comgeom.h" 421 include "dimensions.h" 422 include "paramet.h" 423 include "logic.h" 424 include "comvert.h" 425 include "comgeom.h" 427 426 c 428 427 c … … 875 874 IMPLICIT NONE 876 875 c 877 #include "dimensions.h" 878 #include "paramet.h" 879 #include "logic.h" 880 #include "comvert.h" 881 #include "comconst.h" 876 include "dimensions.h" 877 include "paramet.h" 878 include "logic.h" 879 include "comvert.h" 882 880 c 883 881 c -
LMDZ5/trunk/libf/dyn3dmem/vlspltgen_loc.F
r2286 r2597 31 31 & ok_iso_verif 32 32 USE vlspltgen_mod 33 USE comconst_mod, ONLY: cpp 33 34 IMPLICIT NONE 34 35 35 36 c 36 #include "dimensions.h" 37 #include "paramet.h" 38 #include "logic.h" 39 #include "comvert.h" 40 #include "comconst.h" 37 include "dimensions.h" 38 include "paramet.h" 39 include "logic.h" 40 include "comvert.h" 41 41 42 42 c … … 100 100 101 101 102 103 104 105 106 102 ijb=ij_begin-iip1 103 ije=ij_end+iip1 104 if (pole_nord) ijb=ij_begin 105 if (pole_sud) ije=ij_end 106 107 107 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK) 108 108 DO l = 1, llm 109 109 DO ij = ijb, ije 110 110 tempe(ij) = teta(ij,l) * pk(ij,l) /cpp … … 208 208 #endif 209 209 if(iadv(iq) == 0) then 210 211 212 213 210 211 cycle 212 213 else if (iadv(iq)==10) then 214 214 215 215 #ifdef _ADV_HALO 216 216 ! CRisi: on ajoute les nombres de fils et tableaux des fils 217 217 ! On suppose qu'on ne peut advecter les fils que par le schéma 10. 218 219 & 218 call vlx_loc(zq,pente_max,zm,mu, 219 & ij_begin,ij_begin+2*iip1-1,iq) 220 220 call vlx_loc(zq,pente_max,zm,mu, 221 221 & ij_end-2*iip1+1,ij_end,iq) 222 222 #else 223 224 & 223 call vlx_loc(zq,pente_max,zm,mu, 224 & ij_begin,ij_end,iq) 225 225 #endif 226 226 … … 240 240 call VTe(VTHallo) 241 241 c$OMP END MASTER 242 242 else if (iadv(iq)==14) then 243 243 244 244 #ifdef _ADV_HALO … … 268 268 c$OMP END MASTER 269 269 else 270 271 270 271 stop 'vlspltgen_p : schema non parallelise' 272 272 273 273 endif … … 301 301 302 302 if(iadv(iq) == 0) then 303 304 305 306 303 304 cycle 305 306 else if (iadv(iq)==10) then 307 307 308 308 #ifdef _ADV_HALLO … … 310 310 & ij_begin+2*iip1,ij_end-2*iip1,iq) 311 311 #endif 312 312 else if (iadv(iq)==14) then 313 313 #ifdef _ADV_HALLO 314 314 call vlxqs_loc(zq,pente_max,zm,mu, … … 316 316 #endif 317 317 else 318 319 318 319 stop 'vlspltgen_p : schema non parallelise' 320 320 321 321 endif … … 358 358 359 359 if(iadv(iq) == 0) then 360 361 362 363 360 361 cycle 362 363 else if (iadv(iq)==10) then 364 364 365 365 call vly_loc(zq,pente_max,zm,mv,iq) 366 366 367 367 else if (iadv(iq)==14) then 368 368 369 369 call vlyqs_loc(zq,pente_max,zm,mv, … … 371 371 372 372 else 373 374 373 374 stop 'vlspltgen_p : schema non parallelise' 375 375 376 376 endif … … 389 389 #endif 390 390 if(iadv(iq) == 0) then 391 392 393 394 391 392 cycle 393 394 else if (iadv(iq)==10 .or. iadv(iq)==14 ) then 395 395 396 396 c$OMP BARRIER … … 420 420 c$OMP MASTER 421 421 call VTe(VTHallo) 422 c$OMP END MASTER 422 c$OMP END MASTER 423 423 c$OMP BARRIER 424 424 else 425 426 425 426 stop 'vlspltgen_p : schema non parallelise' 427 427 428 428 endif … … 439 439 c$OMP MASTER 440 440 call VTe(VTHallo) 441 c$OMP END MASTER 441 c$OMP END MASTER 442 442 443 443 … … 451 451 452 452 if(iadv(iq) == 0) then 453 454 455 456 453 454 cycle 455 456 else if (iadv(iq)==10 .or. iadv(iq)==14 ) then 457 457 c$OMP BARRIER 458 458 … … 464 464 c$OMP BARRIER 465 465 else 466 467 466 467 stop 'vlspltgen_p : schema non parallelise' 468 468 469 469 endif … … 501 501 #endif 502 502 if(iadv(iq) == 0) then 503 504 505 506 503 504 cycle 505 506 else if (iadv(iq)==10) then 507 507 508 508 call vly_loc(zq,pente_max,zm,mv,iq) 509 509 510 510 else if (iadv(iq)==14) then 511 511 512 512 call vlyqs_loc(zq,pente_max,zm,mv, … … 514 514 515 515 else 516 517 516 517 stop 'vlspltgen_p : schema non parallelise' 518 518 519 519 endif … … 532 532 #endif 533 533 if(iadv(iq) == 0) then 534 535 536 537 534 535 cycle 536 537 else if (iadv(iq)==10) then 538 538 539 539 call vlx_loc(zq,pente_max,zm,mu, 540 540 & ij_begin,ij_end,iq) 541 541 542 542 else if (iadv(iq)==14) then 543 543 544 544 call vlxqs_loc(zq,pente_max,zm,mu, … … 546 546 547 547 else 548 548 549 549 stop 'vlspltgen_p : schema non parallelise' 550 550 … … 574 574 DO ij=ijb,ije 575 575 c print *,'zq-->',ij,l,iq,zq(ij,l,iq) 576 c 577 576 c print *,'q-->',ij,l,iq,q(ij,l,iq) 577 q(ij,l,iq)=zq(ij,l,iq) 578 578 ENDDO 579 579 ENDDO -
LMDZ5/trunk/libf/dyn3dmem/vlspltqs_loc.F
r2286 r2597 12 12 IMPLICIT NONE 13 13 c 14 #include "dimensions.h" 15 #include "paramet.h" 16 #include "logic.h" 17 #include "comvert.h" 18 #include "comconst.h" 14 include "dimensions.h" 15 include "paramet.h" 16 include "logic.h" 17 include "comvert.h" 19 18 c 20 19 c … … 420 419 USE parallel_lmdz 421 420 USE infotrac, ONLY : nqtot,nqfils,nqdesc,iqfils ! CRisi 421 USE comconst_mod, ONLY: pi 422 422 IMPLICIT NONE 423 423 c 424 #include "dimensions.h" 425 #include "paramet.h" 426 #include "logic.h" 427 #include "comvert.h" 428 #include "comconst.h" 429 #include "comgeom.h" 424 include "dimensions.h" 425 include "paramet.h" 426 include "logic.h" 427 include "comvert.h" 428 include "comgeom.h" 430 429 c 431 430 c -
LMDZ5/trunk/libf/dyn3dmem/writedynav_loc.F
r2475 r2597 13 13 USE infotrac, ONLY : nqtot, ttext 14 14 use com_io_dyn_mod, only : histaveid,histvaveid,histuaveid 15 USE comconst_mod, ONLY: cpp 15 16 implicit none 16 17 … … 41 42 C 42 43 C Declarations 43 #include "dimensions.h" 44 #include "paramet.h" 45 #include "comconst.h" 46 #include "comvert.h" 47 #include "comgeom.h" 48 #include "temps.h" 49 #include "ener.h" 50 #include "logic.h" 51 #include "description.h" 52 #include "serre.h" 53 #include "iniprint.h" 44 include "dimensions.h" 45 include "paramet.h" 46 include "comvert.h" 47 include "comgeom.h" 48 include "temps.h" 49 include "ener.h" 50 include "logic.h" 51 include "description.h" 52 include "serre.h" 53 include "iniprint.h" 54 54 55 55 C -
LMDZ5/trunk/libf/dyn3dmem/writehist_loc.F
r2475 r2597 13 13 USE infotrac, ONLY : nqtot, ttext 14 14 use com_io_dyn_mod, only : histid,histvid,histuid 15 USE comconst_mod, ONLY: cpp 15 16 implicit none 16 17 … … 41 42 C 42 43 C Declarations 43 #include "dimensions.h" 44 #include "paramet.h" 45 #include "comconst.h" 46 #include "comvert.h" 47 #include "comgeom.h" 48 #include "temps.h" 49 #include "ener.h" 50 #include "logic.h" 51 #include "description.h" 52 #include "serre.h" 53 #include "iniprint.h" 44 include "dimensions.h" 45 include "paramet.h" 46 include "comvert.h" 47 include "comgeom.h" 48 include "temps.h" 49 include "ener.h" 50 include "logic.h" 51 include "description.h" 52 include "serre.h" 53 include "iniprint.h" 54 54 55 55 C
Note: See TracChangeset
for help on using the changeset viewer.
