Changeset 2601 for LMDZ5/trunk/libf/dyn3dpar
- Timestamp:
- Jul 24, 2016, 11:51:55 AM (8 years ago)
- Location:
- LMDZ5/trunk/libf/dyn3dpar
- Files:
-
- 16 edited
- 1 moved
-
advtrac_p.F90 (modified) (1 diff)
-
bilan_dyn_p.F (modified) (2 diffs)
-
conf_gcm.F90 (modified) (2 diffs)
-
dynetat0.F (modified) (2 diffs)
-
dynredem.F (modified) (4 diffs)
-
dynredem_p.F (modified) (4 diffs)
-
fluxstokenc_p.F (modified) (1 diff)
-
gcm.F (modified) (3 diffs)
-
iniacademic.F90 (modified) (2 diffs)
-
initdynav_p.F (modified) (2 diffs)
-
initfluxsto_p.F (modified) (2 diffs)
-
inithist_p.F (modified) (2 diffs)
-
integrd_p.F (modified) (4 diffs)
-
leapfrog_p.F (modified) (2 diffs)
-
temps_mod.F90 (moved) (moved from LMDZ5/trunk/libf/dyn3dpar/temps.h) (1 diff)
-
writedynav_p.F (modified) (2 diffs)
-
writehist_p.F (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/trunk/libf/dyn3dpar/advtrac_p.F90
r2600 r2601 27 27 include "comgeom2.h" 28 28 include "logic.h" 29 include "temps.h"30 29 include "ener.h" 31 30 include "description.h" -
LMDZ5/trunk/libf/dyn3dpar/bilan_dyn_p.F
r2600 r2601 19 19 USE comconst_mod, ONLY: cpp, pi 20 20 USE comvert_mod, ONLY: presnivs 21 USE temps_mod, ONLY: annee_ref, day_ref, itau_dyn 21 22 22 23 IMPLICIT NONE … … 25 26 #include "paramet.h" 26 27 #include "comgeom2.h" 27 #include "temps.h"28 28 #include "iniprint.h" 29 29 -
LMDZ5/trunk/libf/dyn3dpar/conf_gcm.F90
r2598 r2601 21 21 USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, & 22 22 alphax,alphay,taux,tauy 23 USE temps_mod, ONLY: calend 23 24 24 25 IMPLICIT NONE … … 41 42 include "logic.h" 42 43 include "comdissnew.h" 43 include "temps.h"44 44 include "iniprint.h" 45 45 -
LMDZ5/trunk/libf/dyn3dpar/dynetat0.F
r2600 r2601 14 14 15 15 USE serre_mod, ONLY: clon,clat,grossismx,grossismy 16 USE temps_mod, ONLY: annee_ref,day_ref,itau_dyn, 17 & start_time,day_ini,hour_ini 16 18 17 19 IMPLICIT NONE … … 34 36 #include "dimensions.h" 35 37 #include "paramet.h" 36 #include "temps.h"37 38 #include "comgeom2.h" 38 39 #include "ener.h" -
LMDZ5/trunk/libf/dyn3dpar/dynredem.F
r2600 r2601 14 14 USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, 15 15 & taux,tauy 16 USE temps_mod, ONLY: annee_ref,day_ref,itau_dyn,itaufin, 17 & start_time,hour_ini 16 18 17 19 IMPLICIT NONE … … 24 26 #include "paramet.h" 25 27 #include "comgeom2.h" 26 #include "temps.h"27 28 #include "ener.h" 28 29 #include "logic.h" … … 473 474 use netcdf, only: NF90_get_VAR 474 475 use netcdf95, only: NF95_PUT_VAR 476 USE temps_mod, ONLY: itau_dyn, itaufin 475 477 476 478 IMPLICIT NONE … … 483 485 #include "netcdf.inc" 484 486 #include "comgeom.h" 485 #include "temps.h"486 487 #include "iniprint.h" 487 488 -
LMDZ5/trunk/libf/dyn3dpar/dynredem_p.F
r2600 r2601 15 15 USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy, 16 16 & taux,tauy 17 USE temps_mod, ONLY: annee_ref,day_ref,itau_dyn,itaufin, 18 & start_time,hour_ini 17 19 18 20 IMPLICIT NONE … … 25 27 #include "paramet.h" 26 28 #include "comgeom2.h" 27 #include "temps.h"28 29 #include "ener.h" 29 30 #include "logic.h" … … 474 475 use netcdf, only: NF90_get_VAR 475 476 use netcdf95, only: NF95_PUT_VAR 477 USE temps_mod, ONLY: itau_dyn, itaufin 476 478 477 479 IMPLICIT NONE … … 484 486 #include "netcdf.inc" 485 487 #include "comgeom.h" 486 #include "temps.h"487 488 488 489 -
LMDZ5/trunk/libf/dyn3dpar/fluxstokenc_p.F
r2600 r2601 23 23 #include "comgeom.h" 24 24 #include "tracstoke.h" 25 #include "temps.h"26 25 #include "iniprint.h" 27 26 -
LMDZ5/trunk/libf/dyn3dpar/gcm.F
r2600 r2601 33 33 #endif 34 34 USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, r, rad 35 USE temps_mod, ONLY: calend,start_time,annee_ref,day_ref, 36 & itau_dyn,itau_phy,day_ini,jD_ref,jH_ref,day_end, 37 & dt,hour_ini,itaufin 35 38 36 39 IMPLICIT NONE … … 70 73 #include "comgeom.h" 71 74 #include "logic.h" 72 #include "temps.h"73 75 #include "ener.h" 74 76 #include "description.h" … … 498 500 c write(78,*) 'q',q 499 501 500 c$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/,/logici/,/logicl/) 502 !c$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/,/logici/,/logicl/) 503 c$OMP PARALLEL DEFAULT(SHARED) COPYIN(/logici/,/logicl/) 504 c Copy all threadprivate variables from temps_mod 505 c$OMP1 COPYIN(dt,jD_ref,jH_ref,start_time,hour_ini,day_ini,day_end) 506 c$OMP1 COPYIN(annee_ref,day_ref,itau_dyn,itau_phy,itaufin,calend) 501 507 CALL leapfrog_p(ucov,vcov,teta,ps,masse,phis,q,time_0) 502 508 c$OMP END PARALLEL -
LMDZ5/trunk/libf/dyn3dpar/iniacademic.F90
r2600 r2601 18 18 USE comconst_mod, ONLY: cpp, kappa, g, daysec, dtvr, pi, im, jm 19 19 USE comvert_mod, ONLY: ap, bp, preff, presnivs, pressure_exner 20 USE temps_mod, ONLY: annee_ref, day_ini, day_ref 20 21 21 22 ! Author: Frederic Hourdin original: 15/01/93 … … 33 34 include "academic.h" 34 35 include "ener.h" 35 include "temps.h"36 36 include "iniprint.h" 37 37 include "logic.h" -
LMDZ5/trunk/libf/dyn3dpar/initdynav_p.F
r2600 r2601 14 14 USE comconst_mod, ONLY: pi 15 15 USE comvert_mod, ONLY: nivsigs 16 USE temps_mod, ONLY: itau_dyn 16 17 17 18 implicit none … … 46 47 #include "paramet.h" 47 48 #include "comgeom.h" 48 #include "temps.h"49 49 #include "ener.h" 50 50 #include "logic.h" -
LMDZ5/trunk/libf/dyn3dpar/initfluxsto_p.F
r2600 r2601 15 15 USE comconst_mod, ONLY: pi 16 16 USE comvert_mod, ONLY: nivsigs 17 USE temps_mod, ONLY: annee_ref, day_ref, itau_dyn 17 18 18 19 implicit none … … 48 49 #include "paramet.h" 49 50 #include "comgeom.h" 50 #include "temps.h"51 51 #include "ener.h" 52 52 #include "logic.h" -
LMDZ5/trunk/libf/dyn3dpar/inithist_p.F
r2600 r2601 15 15 USE comconst_mod, ONLY: pi 16 16 USE comvert_mod, ONLY: nivsigs 17 USE temps_mod, ONLY: itau_dyn 17 18 18 19 implicit none … … 48 49 #include "paramet.h" 49 50 #include "comgeom.h" 50 #include "temps.h"51 51 #include "ener.h" 52 52 #include "logic.h" -
LMDZ5/trunk/libf/dyn3dpar/integrd_p.F
r2600 r2601 9 9 USE comconst_mod, ONLY: pi 10 10 USE comvert_mod, ONLY: ap, bp 11 USE temps_mod, ONLY: dt 12 11 13 IMPLICIT NONE 12 14 … … 31 33 #include "comgeom.h" 32 34 #include "logic.h" 33 #include "temps.h"34 35 #include "iniprint.h" 35 36 … … 283 284 ije=ij_end 284 285 285 286 if (planet_type.eq."earth") then 286 287 ! Earth-specific treatment of first 2 tracers (water) 287 288 c$OMP BARRIER … … 384 385 DO l = 1, llm 385 386 massem1(ijb:ije,l)=massescr(ijb:ije,l) 386 387 c$OMP END DO NOWAIT 387 ENDDO 388 c$OMP END DO NOWAIT 388 389 END IF 389 390 c$OMP BARRIER -
LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F
r2600 r2601 30 30 USE comvert_mod, ONLY: ap,bp,pressure_exner,presnivs 31 31 USE comconst_mod, ONLY: cpp, dtvr, ihf, dtphys, pi, jmp1 32 USE temps_mod, ONLY: itaufin,jD_ref,jH_ref,day_ini, 33 & day_ref,start_time,dt 34 32 35 IMPLICIT NONE 33 36 … … 68 71 #include "comgeom.h" 69 72 #include "logic.h" 70 #include "temps.h"71 73 #include "ener.h" 72 74 #include "description.h" -
LMDZ5/trunk/libf/dyn3dpar/temps_mod.F90
r2600 r2601 2 2 ! $Id$ 3 3 ! 4 ! ATTENTION!!!!: ce fichier include est compatible format fixe/format libre 5 ! veillez n'utiliser que des ! pour les commentaires 6 ! et bien positionner les & des lignes de continuation 7 ! (les placer en colonne 6 et en colonne 73) 8 ! 9 ! 10 ! jD_ref = jour julien de la date de reference (lancement de l'experience) 11 ! hD_ref = "heure" julienne de la date de reference 12 !----------------------------------------------------------------------- 13 ! INCLUDE 'temps.h' 4 MODULE temps_mod 14 5 15 COMMON/temps/ dt, jD_ref, jH_ref, start_time, & 16 & day_ini, day_end, annee_ref, day_ref, & 17 & itau_dyn, itau_phy, itaufin, calend 6 IMPLICIT NONE 18 7 8 INTEGER itaufin ! total number of dynamical steps for the run 9 INTEGER itau_dyn 10 INTEGER itau_phy 11 INTEGER day_ini ! initial day # of simulation sequence 12 INTEGER day_end ! final day # ; i.e. day # when this simulation ends 13 INTEGER annee_ref 14 INTEGER day_ref 15 REAL dt ! (dynamics) time step (changes if doing Matsuno or LF step) 16 REAL jD_ref ! reference julian day date (beginning of experiment) 17 REAL jH_ref ! reference julian "hour" of reference julian date 18 REAL start_time 19 CHARACTER (len=10) :: calend ! calendar type 19 20 20 INTEGER itaufin 21 INTEGER itau_dyn, itau_phy 22 INTEGER day_ini, day_end, annee_ref, day_ref 23 REAL dt, jD_ref, jH_ref, start_time 24 CHARACTER (len=10) :: calend 21 ! Additionnal Mars stuff: 22 REAL hour_ini ! initial fraction of day of simulation sequence (0=<hour_ini<1) 25 23 26 !$OMP THREADPRIVATE(/temps/) 27 !----------------------------------------------------------------------- 24 !$OMP THREADPRIVATE(dt,jD_ref,jH_ref,start_time,hour_ini, & 25 !$OMP day_ini,day_end,annee_ref,day_ref,itau_dyn,itau_phy,itaufin,& 26 !$OMP calend) 27 28 !WARNING: when adding a threadprivate variable in this module 29 ! do not forget to add it to the copyin clause when opening an OpenMP 30 ! parallel section. e.g. in gcm before call leapfrog_loc and/or 31 ! possibly in iniphysiq 32 33 END MODULE temps_mod -
LMDZ5/trunk/libf/dyn3dpar/writedynav_p.F
r2600 r2601 13 13 USE infotrac 14 14 USE comconst_mod, ONLY: cpp 15 USE temps_mod, ONLY: itau_dyn 16 15 17 implicit none 16 18 … … 44 46 #include "paramet.h" 45 47 #include "comgeom.h" 46 #include "temps.h"47 48 #include "ener.h" 48 49 #include "logic.h" -
LMDZ5/trunk/libf/dyn3dpar/writehist_p.F
r2600 r2601 12 12 USE misc_mod 13 13 USE infotrac 14 USE temps_mod, ONLY: itau_dyn 15 14 16 implicit none 15 17 … … 44 46 #include "paramet.h" 45 47 #include "comgeom.h" 46 #include "temps.h"47 48 #include "ener.h" 48 49 #include "logic.h"
Note: See TracChangeset
for help on using the changeset viewer.
