- Timestamp:
- Jan 30, 2017, 5:54:45 PM (8 years ago)
- Location:
- LMDZ5/branches/testing
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
libf/phylmd/phys_local_var_mod.F90 (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/branches/testing
- Property svn:mergeinfo changed
/LMDZ5/trunk merged: 2728,2730-2775,2777-2785
- Property svn:mergeinfo changed
-
LMDZ5/branches/testing/libf/phylmd/phys_local_var_mod.F90
r2720 r2787 255 255 REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: ale_wake, alp_wake 256 256 !$OMP THREADPRIVATE(ale_wake, alp_wake) 257 REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: wake_h 258 !$OMP THREADPRIVATE(wake_h )257 REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: wake_h,wake_k 258 !$OMP THREADPRIVATE(wake_h,wake_k) 259 259 REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: wake_omg 260 260 !$OMP THREADPRIVATE(wake_omg) … … 419 419 420 420 #ifdef CPP_StratAer 421 ! variables for strat. aerosol CK 421 ! 422 ! variables for stratospheric aerosol 422 423 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: R2SO4 423 424 !$OMP THREADPRIVATE(R2SO4) … … 426 427 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: f_r_wet 427 428 !$OMP THREADPRIVATE(f_r_wet) 428 REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: sfluxaer429 !$OMP THREADPRIVATE(sfluxaer)430 429 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: decfluxaer 431 430 !$OMP THREADPRIVATE(decfluxaer) 432 431 REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: mdw 433 432 !$OMP THREADPRIVATE(mdw) 434 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sulf_convert435 !$OMP THREADPRIVATE(sulf_convert)436 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sulf_nucl437 !$OMP THREADPRIVATE(sulf_nucl)438 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sulf_cond_evap439 !$OMP THREADPRIVATE(sulf_cond_evap)440 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: ocs_convert441 !$OMP THREADPRIVATE(ocs_convert)442 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: SO2_backgr_tend443 !$OMP THREADPRIVATE(SO2_backgr_tend)444 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: OCS_backgr_tend445 !$OMP THREADPRIVATE(OCS_backgr_tend)446 433 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: OCS_lifetime 447 434 !$OMP THREADPRIVATE(OCS_lifetime) … … 456 443 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: tau_strat_550 457 444 !$OMP THREADPRIVATE(tau_strat_550) 458 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: tau_strat_550_lay459 !$OMP THREADPRIVATE(tau_strat_550_lay)460 445 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: tau_strat_1020 461 446 !$OMP THREADPRIVATE(tau_strat_1020) 462 447 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: tausum_strat 463 448 !$OMP THREADPRIVATE(tausum_strat) 464 REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: sulf_dep_dry465 !$OMP THREADPRIVATE(sulf_dep_dry)466 REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: sulf_dep_wet467 !$OMP THREADPRIVATE(sulf_dep_wet)468 449 REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: surf_PM25_sulf 469 450 !$OMP THREADPRIVATE(surf_PM25_sulf) … … 472 453 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: vsed_aer 473 454 !$OMP THREADPRIVATE(vsed_aer) 455 ! 456 !---3D budget variables 457 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: budg_3D_nucl 458 !$OMP THREADPRIVATE(budg_3D_nucl) 459 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: budg_3D_cond_evap 460 !$OMP THREADPRIVATE(budg_3D_cond_evap) 461 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: budg_3D_ocs_to_so2 462 !$OMP THREADPRIVATE(budg_3D_ocs_to_so2) 463 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: budg_3D_so2_to_h2so4 464 !$OMP THREADPRIVATE(budg_3D_so2_to_h2so4) 465 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: budg_3D_backgr_ocs 466 !$OMP THREADPRIVATE(budg_3D_backgr_ocs) 467 REAL, ALLOCATABLE, SAVE, DIMENSION(:,:) :: budg_3D_backgr_so2 468 !$OMP THREADPRIVATE(budg_3D_backgr_so2) 469 ! 470 !---2D budget variables 471 REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: budg_dep_dry_h2so4 472 REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: budg_dep_dry_part 473 !$OMP THREADPRIVATE(budg_dep_dry_h2so4,budg_dep_dry_part) 474 REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: budg_dep_wet_h2so4 475 REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: budg_dep_wet_part 476 !$OMP THREADPRIVATE(budg_dep_wet_h2so4,budg_dep_wet_part) 477 REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: budg_emi_ocs 478 REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: budg_emi_so2 479 REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: budg_emi_h2so4 480 REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: budg_emi_part 481 !$OMP THREADPRIVATE(budg_emi_ocs,budg_emi_so2,budg_emi_h2so4,budg_emi_part) 482 REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: budg_ocs_to_so2 483 REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: budg_so2_to_h2so4 484 REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: budg_h2so4_to_part 485 !$OMP THREADPRIVATE(budg_ocs_to_so2,budg_so2_to_h2so4,budg_h2so4_to_part) 486 REAL, ALLOCATABLE, SAVE, DIMENSION(:) :: budg_sed_part 487 !$OMP THREADPRIVATE(budg_sed_part) 474 488 #endif 475 489 … … 614 628 !! Wake variables 615 629 ALLOCATE(ale_wake(klon), alp_wake(klon)) 616 ALLOCATE(wake_h(klon) )630 ALLOCATE(wake_h(klon),wake_k(klon)) 617 631 ALLOCATE(wake_omg(klon, klev)) 618 632 ALLOCATE(d_deltat_wk(klon, klev), d_deltaq_wk(klon, klev)) … … 718 732 ALLOCATE (DENSO4(klon,klev)) 719 733 ALLOCATE (f_r_wet(klon,klev)) 720 ALLOCATE (sfluxaer(klon))721 734 ALLOCATE (decfluxaer(klon,nbtr)) 722 735 ALLOCATE (mdw(nbtr)) 723 ALLOCATE ( sulf_convert(klon,klev))724 ALLOCATE ( sulf_nucl(klon,klev))725 ALLOCATE ( sulf_cond_evap(klon,klev))726 ALLOCATE ( ocs_convert(klon,klev))727 ALLOCATE ( SO2_backgr_tend(klon,klev))728 ALLOCATE ( OCS_backgr_tend(klon,klev))736 ALLOCATE (budg_3D_nucl(klon,klev)) 737 ALLOCATE (budg_3D_cond_evap(klon,klev)) 738 ALLOCATE (budg_3D_ocs_to_so2(klon,klev)) 739 ALLOCATE (budg_3D_so2_to_h2so4(klon,klev)) 740 ALLOCATE (budg_3D_backgr_ocs(klon,klev)) 741 ALLOCATE (budg_3D_backgr_so2(klon,klev)) 729 742 ALLOCATE (OCS_lifetime(klon,klev)) 730 743 ALLOCATE (SO2_lifetime(klon,klev)) … … 733 746 ALLOCATE (cg_bin(nbands_sw_rrtm+nbands_lw_rrtm+nwave+nwave_lw,nbtr)) 734 747 ALLOCATE (tau_strat_550(klon,klev)) 735 ALLOCATE (tau_strat_550_lay(klon,klev))736 748 ALLOCATE (tau_strat_1020(klon,klev)) 737 749 ALLOCATE (tausum_strat(klon,3)) 738 ALLOCATE (sulf_dep_dry(klon)) 739 ALLOCATE (sulf_dep_wet(klon)) 750 ALLOCATE (budg_dep_dry_h2so4(klon)) 751 ALLOCATE (budg_dep_wet_h2so4(klon)) 752 ALLOCATE (budg_dep_dry_part(klon)) 753 ALLOCATE (budg_dep_wet_part(klon)) 754 ALLOCATE (budg_emi_ocs(klon)) 755 ALLOCATE (budg_emi_so2(klon)) 756 ALLOCATE (budg_emi_h2so4(klon)) 757 ALLOCATE (budg_emi_part(klon)) 758 ALLOCATE (budg_ocs_to_so2(klon)) 759 ALLOCATE (budg_so2_to_h2so4(klon)) 760 ALLOCATE (budg_h2so4_to_part(klon)) 761 ALLOCATE (budg_sed_part(klon)) 740 762 ALLOCATE (surf_PM25_sulf(klon)) 741 763 ALLOCATE (p_tropopause(klon)) … … 867 889 ! 868 890 DEALLOCATE(ale_wake, alp_wake) 869 DEALLOCATE(wake_h )891 DEALLOCATE(wake_h,wake_k) 870 892 DEALLOCATE(wake_omg) 871 893 DEALLOCATE(d_deltat_wk, d_deltaq_wk) … … 964 986 DEALLOCATE (DENSO4) 965 987 DEALLOCATE (f_r_wet) 966 DEALLOCATE (sfluxaer)967 988 DEALLOCATE (decfluxaer) 968 989 DEALLOCATE (mdw) 969 DEALLOCATE (sulf_convert)970 DEALLOCATE (sulf_nucl)971 DEALLOCATE (sulf_cond_evap)972 DEALLOCATE (ocs_convert)973 DEALLOCATE (SO2_backgr_tend)974 DEALLOCATE (OCS_backgr_tend)975 990 DEALLOCATE (SO2_lifetime) 976 991 DEALLOCATE (OCS_lifetime) … … 979 994 DEALLOCATE (cg_bin) 980 995 DEALLOCATE (tau_strat_550) 981 DEALLOCATE (tau_strat_550_lay)982 996 DEALLOCATE (tau_strat_1020) 983 997 DEALLOCATE (tausum_strat) 984 DEALLOCATE (sulf_dep_dry)985 DEALLOCATE (sulf_dep_wet)986 998 DEALLOCATE (surf_PM25_sulf) 987 999 DEALLOCATE (p_tropopause) 988 1000 DEALLOCATE (vsed_aer) 1001 DEALLOCATE (budg_3D_ocs_to_so2) 1002 DEALLOCATE (budg_3D_so2_to_h2so4) 1003 DEALLOCATE (budg_3D_backgr_ocs) 1004 DEALLOCATE (budg_3D_backgr_so2) 1005 DEALLOCATE (budg_3D_nucl) 1006 DEALLOCATE (budg_3D_cond_evap) 1007 DEALLOCATE (budg_dep_dry_h2so4) 1008 DEALLOCATE (budg_dep_wet_h2so4) 1009 DEALLOCATE (budg_dep_dry_part) 1010 DEALLOCATE (budg_dep_wet_part) 1011 DEALLOCATE (budg_emi_ocs) 1012 DEALLOCATE (budg_emi_so2) 1013 DEALLOCATE (budg_emi_h2so4) 1014 DEALLOCATE (budg_emi_part) 1015 DEALLOCATE (budg_ocs_to_so2) 1016 DEALLOCATE (budg_so2_to_h2so4) 1017 DEALLOCATE (budg_h2so4_to_part) 1018 DEALLOCATE (budg_sed_part) 989 1019 #endif 990 1020
Note: See TracChangeset
for help on using the changeset viewer.
