Changeset 4703 for LMDZ6/trunk/libf


Ignore:
Timestamp:
Sep 20, 2023, 3:09:14 PM (16 months ago)
Author:
Laurent Fairhead
Message:

Moving around some variable declarations to their right place

Location:
LMDZ6/trunk/libf
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/trunk/libf/phylmd/phys_local_var_mod.F90

    r4677 r4703  
    161161      REAL, SAVE, ALLOCATABLE :: tau3d_aero(:,:,:,:)
    162162      !$OMP THREADPRIVATE(tau3d_aero)
    163       REAL, SAVE, ALLOCATABLE :: scdnc(:,:)
    164       !$OMP THREADPRIVATE(scdnc)
    165163      REAL, SAVE, ALLOCATABLE :: dNovrN(:)
    166164      !$OMP THREADPRIVATE(dNovrN)
    167       REAL, SAVE, ALLOCATABLE :: cldncl(:)
    168       !$OMP THREADPRIVATE(cldncl)
    169       REAL, SAVE, ALLOCATABLE :: reffclwtop(:)
    170       !$OMP THREADPRIVATE(reffclwtop)
    171       REAL, SAVE, ALLOCATABLE :: lcc(:)
    172       !$OMP THREADPRIVATE(lcc)
    173       REAL, SAVE, ALLOCATABLE :: reffclws(:,:)
    174       !$OMP THREADPRIVATE(reffclws)
    175       REAL, SAVE, ALLOCATABLE :: reffclwc(:,:)
    176       !$OMP THREADPRIVATE(reffclwc)
    177       REAL, SAVE, ALLOCATABLE :: cldnvi(:)
    178       !$OMP THREADPRIVATE(cldnvi)
    179       REAL, SAVE, ALLOCATABLE :: lcc3d(:,:)
    180       !$OMP THREADPRIVATE(lcc3d)
    181       REAL, SAVE, ALLOCATABLE :: lcc3dcon(:,:)
    182       !$OMP THREADPRIVATE(lcc3dcon)
    183       REAL, SAVE, ALLOCATABLE :: lcc3dstra(:,:)
    184       !$OMP THREADPRIVATE(lcc3dstra)
    185       REAL, SAVE, ALLOCATABLE :: icc3dcon(:,:)
    186       !$OMP THREADPRIVATE(icc3dcon)
    187       REAL, SAVE, ALLOCATABLE :: icc3dstra(:,:)
    188       !$OMP THREADPRIVATE(icc3dstra)
    189165      REAL, SAVE, ALLOCATABLE :: zfice(:,:)
    190166      !$OMP THREADPRIVATE(zfice)
    … …  
    726702      ALLOCATE(drytausum_aero(klon,naero_tot))
    727703      ALLOCATE(tau3d_aero(klon,klev,nwave,naero_tot))
    728       ALLOCATE(scdnc(klon, klev))
    729704      ALLOCATE(dNovrN(klon))
    730       ALLOCATE(cldncl(klon))
    731       ALLOCATE(reffclwtop(klon))
    732       ALLOCATE(lcc(klon))
    733       ALLOCATE(reffclws(klon, klev))
    734       ALLOCATE(reffclwc(klon, klev))
    735       ALLOCATE(cldnvi(klon))
    736       ALLOCATE(lcc3d(klon, klev))
    737       ALLOCATE(lcc3dcon(klon, klev))
    738       ALLOCATE(lcc3dstra(klon, klev))
    739       ALLOCATE(icc3dcon(klon, klev))
    740       ALLOCATE(icc3dstra(klon, klev))
    741705      ALLOCATE(zfice(klon, klev))
    742706      ALLOCATE(od443aer(klon))
    … …  
    10671031      DEALLOCATE(drytausum_aero)
    10681032      DEALLOCATE(tau3d_aero)
    1069       DEALLOCATE(scdnc)
    10701033      DEALLOCATE(dNovrN)
    1071       DEALLOCATE(cldncl)
    1072       DEALLOCATE(reffclwtop)
    1073       DEALLOCATE(lcc)
    1074       DEALLOCATE(reffclws)
    1075       DEALLOCATE(reffclwc)
    1076       DEALLOCATE(cldnvi)
    1077       DEALLOCATE(lcc3d)
    1078       DEALLOCATE(lcc3dcon)
    1079       DEALLOCATE(lcc3dstra)
    1080       DEALLOCATE(icc3dcon)
    1081       DEALLOCATE(icc3dstra)
    10821034      DEALLOCATE(zfice)
    10831035      DEALLOCATE(od443aer)

  • LMDZ6/trunk/libf/phylmd/phys_output_var_mod.F90

    r4523 r4703  
    6767  !$OMP THREADPRIVATE(map_emis_Cb,map_pcld_Cb,map_tcld_Cb,map_emis_ThCi)
    6868  REAL, SAVE, ALLOCATABLE :: map_emis_Anv(:),map_pcld_Anv(:),map_tcld_Anv(:)
    69   !$OMP THREADPRIVATE(map_pcld_ThCi,map_tcld_ThCi,map_emis_Anv,map_pcld_Anv,map_tcld_Anv)             
     69  !$OMP THREADPRIVATE(map_pcld_ThCi,map_tcld_ThCi,map_emis_Anv,map_pcld_Anv,map_tcld_Anv)
     70
     71  ! variables deplacees de phys_local_var_mod
     72  REAL, SAVE, ALLOCATABLE :: scdnc(:,:)
     73  !$OMP THREADPRIVATE(scdnc)
     74  REAL, SAVE, ALLOCATABLE :: cldncl(:)
     75  !$OMP THREADPRIVATE(cldncl)
     76  REAL, SAVE, ALLOCATABLE :: reffclwtop(:)
     77  !$OMP THREADPRIVATE(reffclwtop)
     78  REAL, SAVE, ALLOCATABLE :: lcc(:)
     79  !$OMP THREADPRIVATE(lcc)
     80  REAL, SAVE, ALLOCATABLE :: reffclws(:,:)
     81  !$OMP THREADPRIVATE(reffclws)
     82  REAL, SAVE, ALLOCATABLE :: reffclwc(:,:)
     83  !$OMP THREADPRIVATE(reffclwc)
     84  REAL, SAVE, ALLOCATABLE :: cldnvi(:)
     85  !$OMP THREADPRIVATE(cldnvi)
     86  REAL, SAVE, ALLOCATABLE :: lcc3d(:,:)
     87  !$OMP THREADPRIVATE(lcc3d)
     88  REAL, SAVE, ALLOCATABLE :: lcc3dcon(:,:)
     89  !$OMP THREADPRIVATE(lcc3dcon)
     90  REAL, SAVE, ALLOCATABLE :: lcc3dstra(:,:)
     91  !$OMP THREADPRIVATE(lcc3dstra)
     92  REAL, SAVE, ALLOCATABLE :: icc3dcon(:,:)
     93  !$OMP THREADPRIVATE(icc3dcon)
     94  REAL, SAVE, ALLOCATABLE :: icc3dstra(:,:)
     95  !$OMP THREADPRIVATE(icc3dstra) 
    7096   
    7197
    … …  
    213239         sss(klon))
    214240
     241! Sorties de lmdz_cloud_optics_pro
     242    ALLOCATE(scdnc(klon, klev))
     243    ALLOCATE(cldncl(klon))
     244    ALLOCATE(reffclwtop(klon))
     245    ALLOCATE(lcc(klon))
     246    ALLOCATE(reffclws(klon, klev))
     247    ALLOCATE(reffclwc(klon, klev))
     248    ALLOCATE(cldnvi(klon))
     249    ALLOCATE(lcc3d(klon, klev))
     250    ALLOCATE(lcc3dcon(klon, klev))
     251    ALLOCATE(lcc3dstra(klon, klev))
     252    ALLOCATE(icc3dcon(klon, klev))
     253    ALLOCATE(icc3dstra(klon, klev))
     254
    215255  END SUBROUTINE phys_output_var_init
    216256
    … …  
    251291  !   endif
    252292
     293    DEALLOCATE(scdnc)
     294    DEALLOCATE(cldncl)
     295    DEALLOCATE(reffclwtop)
     296    DEALLOCATE(lcc)
     297    DEALLOCATE(reffclws)
     298    DEALLOCATE(reffclwc)
     299    DEALLOCATE(cldnvi)
     300    DEALLOCATE(lcc3d)
     301    DEALLOCATE(lcc3dcon)
     302    DEALLOCATE(lcc3dstra)
     303    DEALLOCATE(icc3dcon)
     304    DEALLOCATE(icc3dstra)
     305
    253306  END SUBROUTINE phys_output_var_end
    254307

  • LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90

    r4677 r4703  
    342342         toplwad_aero, toplwad0_aero, sollwad_aero, &
    343343         sollwad0_aero, toplwai_aero, sollwai_aero, &
    344          scdnc, cldncl, reffclws, reffclwc, cldnvi, stratomask,&
    345          lcc, lcc3d, lcc3dcon, lcc3dstra, &
    346          icc3dcon, icc3dstra, zfice, reffclwtop, &
     344         stratomask,&
     345         zfice, &
    347346         ec550aer, flwc, fiwc, t_seri, theta, q_seri, &
    348347         ql_seri, qs_seri, qbs_seri, tr_seri, qbs_seri,&
    … …  
    378377! offline
    379378         da, mp, phi, wght_cvfd
    380 
     379    USE phys_output_var_mod, ONLY: scdnc, cldncl, reffclwtop, lcc, reffclws, &
     380         reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra
     381   
    381382
    382383#ifdef CPP_StratAer

  • LMDZ6/trunk/libf/phylmd/physiq_mod.F90

    r4692 r4703  
    358358       zxfluxt,zxfluxq
    359359       !
    360        USE phys_local_var_mod, ONLY: scdnc, cldncl, reffclwtop, lcc, reffclws, &
    361        reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra,  &
    362        zfice, dNovrN, ptconv
     360       USE phys_local_var_mod, ONLY: zfice, dNovrN, ptconv
     361       USE phys_output_var_mod, ONLY: scdnc, cldncl, reffclwtop, lcc, reffclws, &
     362       reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra
    363363       USE output_physiqex_mod, ONLY: output_physiqex
    364364

  • LMDZ6/trunk/libf/phylmdiso/phys_local_var_mod.F90

    r4639 r4703  
    198198      REAL, SAVE, ALLOCATABLE :: tau3d_aero(:,:,:,:)
    199199      !$OMP THREADPRIVATE(tau3d_aero)
    200       REAL, SAVE, ALLOCATABLE :: scdnc(:,:)
    201       !$OMP THREADPRIVATE(scdnc)
    202200      REAL, SAVE, ALLOCATABLE :: dNovrN(:)
    203201      !$OMP THREADPRIVATE(dNovrN)
    204       REAL, SAVE, ALLOCATABLE :: cldncl(:)
    205       !$OMP THREADPRIVATE(cldncl)
    206       REAL, SAVE, ALLOCATABLE :: reffclwtop(:)
    207       !$OMP THREADPRIVATE(reffclwtop)
    208       REAL, SAVE, ALLOCATABLE :: lcc(:)
    209       !$OMP THREADPRIVATE(lcc)
    210       REAL, SAVE, ALLOCATABLE :: reffclws(:,:)
    211       !$OMP THREADPRIVATE(reffclws)
    212       REAL, SAVE, ALLOCATABLE :: reffclwc(:,:)
    213       !$OMP THREADPRIVATE(reffclwc)
    214       REAL, SAVE, ALLOCATABLE :: cldnvi(:)
    215       !$OMP THREADPRIVATE(cldnvi)
    216       REAL, SAVE, ALLOCATABLE :: lcc3d(:,:)
    217       !$OMP THREADPRIVATE(lcc3d)
    218       REAL, SAVE, ALLOCATABLE :: lcc3dcon(:,:)
    219       !$OMP THREADPRIVATE(lcc3dcon)
    220       REAL, SAVE, ALLOCATABLE :: lcc3dstra(:,:)
    221       !$OMP THREADPRIVATE(lcc3dstra)
    222       REAL, SAVE, ALLOCATABLE :: icc3dcon(:,:)
    223       !$OMP THREADPRIVATE(icc3dcon)
    224       REAL, SAVE, ALLOCATABLE :: icc3dstra(:,:)
    225       !$OMP THREADPRIVATE(icc3dstra)
    226202      REAL, SAVE, ALLOCATABLE :: zfice(:,:)
    227203      !$OMP THREADPRIVATE(zfice)
    … …  
    847823      ALLOCATE(drytausum_aero(klon,naero_tot))
    848824      ALLOCATE(tau3d_aero(klon,klev,nwave,naero_tot))
    849       ALLOCATE(scdnc(klon, klev))
    850825      ALLOCATE(dNovrN(klon))
    851       ALLOCATE(cldncl(klon))
    852       ALLOCATE(reffclwtop(klon))
    853       ALLOCATE(lcc(klon))
    854       ALLOCATE(reffclws(klon, klev))
    855       ALLOCATE(reffclwc(klon, klev))
    856       ALLOCATE(cldnvi(klon))
    857       ALLOCATE(lcc3d(klon, klev))
    858       ALLOCATE(lcc3dcon(klon, klev))
    859       ALLOCATE(lcc3dstra(klon, klev))
    860       ALLOCATE(icc3dcon(klon, klev))
    861       ALLOCATE(icc3dstra(klon, klev))
    862826      ALLOCATE(zfice(klon, klev))
    863827      ALLOCATE(od443aer(klon))
    … …  
    12411205      DEALLOCATE(drytausum_aero)
    12421206      DEALLOCATE(tau3d_aero)
    1243       DEALLOCATE(scdnc)
    12441207      DEALLOCATE(dNovrN)
    1245       DEALLOCATE(cldncl)
    1246       DEALLOCATE(reffclwtop)
    1247       DEALLOCATE(lcc)
    1248       DEALLOCATE(reffclws)
    1249       DEALLOCATE(reffclwc)
    1250       DEALLOCATE(cldnvi)
    1251       DEALLOCATE(lcc3d)
    1252       DEALLOCATE(lcc3dcon)
    1253       DEALLOCATE(lcc3dstra)
    1254       DEALLOCATE(icc3dcon)
    1255       DEALLOCATE(icc3dstra)
    12561208      DEALLOCATE(zfice)
    12571209      DEALLOCATE(od443aer)

  • LMDZ6/trunk/libf/phylmdiso/phys_output_var_mod.F90

    r4523 r4703  
    6666  !$OMP THREADPRIVATE(map_emis_Cb,map_pcld_Cb,map_tcld_Cb,map_emis_ThCi)
    6767  REAL, SAVE, ALLOCATABLE :: map_emis_Anv(:),map_pcld_Anv(:),map_tcld_Anv(:)
    68   !$OMP THREADPRIVATE(map_pcld_ThCi,map_tcld_ThCi,map_emis_Anv,map_pcld_Anv,map_tcld_Anv)             
     68  !$OMP THREADPRIVATE(map_pcld_ThCi,map_tcld_ThCi,map_emis_Anv,map_pcld_Anv,map_tcld_Anv)
     69
     70  ! variables deplacees de phys_local_var_mod
     71  REAL, SAVE, ALLOCATABLE :: scdnc(:,:)
     72  !$OMP THREADPRIVATE(scdnc)
     73  REAL, SAVE, ALLOCATABLE :: cldncl(:)
     74  !$OMP THREADPRIVATE(cldncl)
     75  REAL, SAVE, ALLOCATABLE :: reffclwtop(:)
     76  !$OMP THREADPRIVATE(reffclwtop)
     77  REAL, SAVE, ALLOCATABLE :: lcc(:)
     78  !$OMP THREADPRIVATE(lcc)
     79  REAL, SAVE, ALLOCATABLE :: reffclws(:,:)
     80  !$OMP THREADPRIVATE(reffclws)
     81  REAL, SAVE, ALLOCATABLE :: reffclwc(:,:)
     82  !$OMP THREADPRIVATE(reffclwc)
     83  REAL, SAVE, ALLOCATABLE :: cldnvi(:)
     84  !$OMP THREADPRIVATE(cldnvi)
     85  REAL, SAVE, ALLOCATABLE :: lcc3d(:,:)
     86  !$OMP THREADPRIVATE(lcc3d)
     87  REAL, SAVE, ALLOCATABLE :: lcc3dcon(:,:)
     88  !$OMP THREADPRIVATE(lcc3dcon)
     89  REAL, SAVE, ALLOCATABLE :: lcc3dstra(:,:)
     90  !$OMP THREADPRIVATE(lcc3dstra)
     91  REAL, SAVE, ALLOCATABLE :: icc3dcon(:,:)
     92  !$OMP THREADPRIVATE(icc3dcon)
     93  REAL, SAVE, ALLOCATABLE :: icc3dstra(:,:)
     94  !$OMP THREADPRIVATE(icc3dstra) 
    6995   
    7096
    … …  
    213239         sss(klon))
    214240
     241! Sorties de lmdz_cloud_optics_pro
     242    ALLOCATE(scdnc(klon, klev))
     243    ALLOCATE(cldncl(klon))
     244    ALLOCATE(reffclwtop(klon))
     245    ALLOCATE(lcc(klon))
     246    ALLOCATE(reffclws(klon, klev))
     247    ALLOCATE(reffclwc(klon, klev))
     248    ALLOCATE(cldnvi(klon))
     249    ALLOCATE(lcc3d(klon, klev))
     250    ALLOCATE(lcc3dcon(klon, klev))
     251    ALLOCATE(lcc3dstra(klon, klev))
     252    ALLOCATE(icc3dcon(klon, klev))
     253    ALLOCATE(icc3dstra(klon, klev))
     254
    215255  END SUBROUTINE phys_output_var_init
    216256
    … …  
    251291  !   endif
    252292
     293    DEALLOCATE(scdnc)
     294    DEALLOCATE(cldncl)
     295    DEALLOCATE(reffclwtop)
     296    DEALLOCATE(lcc)
     297    DEALLOCATE(reffclws)
     298    DEALLOCATE(reffclwc)
     299    DEALLOCATE(cldnvi)
     300    DEALLOCATE(lcc3d)
     301    DEALLOCATE(lcc3dcon)
     302    DEALLOCATE(lcc3dstra)
     303    DEALLOCATE(icc3dcon)
     304    DEALLOCATE(icc3dstra)
     305
    253306  END SUBROUTINE phys_output_var_end
    254307

  • LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

    r4694 r4703  
    397397#endif
    398398       !
    399        USE phys_local_var_mod, ONLY: scdnc, cldncl, reffclwtop, lcc, reffclws, &
    400        reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra,  &
    401        zfice, dNovrN, ptconv
     399       USE phys_local_var_mod, ONLY: zfice, dNovrN, ptconv
     400       USE phys_output_var_mod, ONLY: scdnc, cldncl, reffclwtop, lcc, reffclws, &
     401       reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra
    402402
    403403
Note: See TracChangeset for help on using the changeset viewer.