Ignore:
Timestamp:
Jul 24, 2013, 10:06:39 AM (12 years ago)
Author:
Ehouarn Millour
Message:

Updating makelmdz and create_makelmdz for :

1 parallelism
2 compilation with various versions of orchidee
3 compilation in 1D mode
4 some cleaning

Also some updates in dyn3dmem:
1 allocate_field_mod.f90 renamed allocate_field_mod.F90
2 module dimensions renamed dimensions_mod
3 module allocate_field renamed allocate_field

FH

File:
1 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/trunk/libf/dyn3dmem/mod_hallo.F90

    r1803 r1810  
    6363
    6464  subroutine Init_mod_hallo
    65   USE dimensions
     65  USE dimensions_mod
    6666    implicit none
    6767    integer :: jj_nb_gather(0:mpi_size-1)
    … …  
    196196 
    197197  subroutine Register_SendField(Field,ij,ll,offset,size,target,a_request)
    198   USE dimensions
     198  USE dimensions_mod
    199199  implicit none
    200200
    … …  
    216216     
    217217  subroutine Register_RecvField(Field,ij,ll,offset,size,target,a_request)
    218   USE dimensions
     218  USE dimensions_mod
    219219  implicit none
    220220
    … …  
    239239 
    240240  subroutine Register_SwapField(FieldS,FieldR,ij,ll,jj_Nb_New,a_request)
    241   USE dimensions
     241  USE dimensions_mod
    242242      implicit none
    243243
    … …  
    287287 
    288288  subroutine Register_SwapFieldHallo(FieldS,FieldR,ij,ll,jj_Nb_New,Up,Down,a_request)
    289   USE dimensions
     289  USE dimensions_mod
    290290 
    291291      implicit none
    … …  
    341341  SUBROUTINE Register_SwapField1d_u(FieldS,FieldR,new_dist,a_request,old_dist,up,down)
    342342  USE parallel
    343   USE dimensions
     343  USE dimensions_mod
    344344      IMPLICIT NONE
    345345   
    … …  
    372372  SUBROUTINE Register_SwapField2d_u1d(FieldS,FieldR,new_dist,a_request,old_dist,up,down)
    373373  USE parallel
    374   USE dimensions
     374  USE dimensions_mod
    375375    IMPLICIT NONE
    376376   
    … …  
    406406  SUBROUTINE Register_SwapField3d_u(FieldS,FieldR,new_dist,a_request,old_dist,up,down)
    407407  USE parallel
    408   USE dimensions
     408  USE dimensions_mod
    409409      IMPLICIT NONE
    410410   
    … …  
    441441 SUBROUTINE Register_SwapField1d_u2d(FieldS,FieldR,new_dist,a_request,old_dist,up,down)
    442442  USE parallel
    443   USE dimensions
     443  USE dimensions_mod
    444444
    445445      IMPLICIT NONE
    … …  
    473473  SUBROUTINE Register_SwapField2d_u2d(FieldS,FieldR,new_dist,a_request,old_dist,up,down)
    474474  USE parallel
    475   USE dimensions
     475  USE dimensions_mod
    476476
    477477      IMPLICIT NONE
    … …  
    508508  SUBROUTINE Register_SwapField3d_u2d(FieldS,FieldR,new_dist,a_request,old_dist,up,down)
    509509  USE parallel
    510   USE dimensions
     510  USE dimensions_mod
    511511      IMPLICIT NONE
    512512   
    … …  
    547547  SUBROUTINE Register_SwapField1d_v(FieldS,FieldR,new_dist,a_request,old_dist,up,down)
    548548  USE parallel
    549   USE dimensions
     549  USE dimensions_mod
    550550      IMPLICIT NONE
    551551   
    … …  
    578578  SUBROUTINE Register_SwapField2d_v1d(FieldS,FieldR,new_dist,a_request,old_dist,up,down)
    579579  USE parallel
    580   USE dimensions
     580  USE dimensions_mod
    581581      IMPLICIT NONE
    582582   
    … …  
    612612  SUBROUTINE Register_SwapField3d_v(FieldS,FieldR,new_dist,a_request,old_dist,up,down)
    613613  USE parallel
    614   USE dimensions
     614  USE dimensions_mod
    615615      IMPLICIT NONE
    616616   
    … …  
    648648  SUBROUTINE Register_SwapField1d_v2d(FieldS,FieldR,new_dist,a_request,old_dist,up,down)
    649649  USE parallel
    650   USE dimensions
     650  USE dimensions_mod
    651651      IMPLICIT NONE
    652652   
    … …  
    679679  SUBROUTINE Register_SwapField2d_v2d(FieldS,FieldR,new_dist,a_request,old_dist,up,down)
    680680  USE parallel
    681   USE dimensions
     681  USE dimensions_mod
    682682      IMPLICIT NONE
    683683   
    … …  
    713713  SUBROUTINE Register_SwapField3d_v2d(FieldS,FieldR,new_dist,a_request,old_dist,up,down)
    714714  USE parallel
    715   USE dimensions
     715  USE dimensions_mod
    716716      IMPLICIT NONE
    717717   
    … …  
    748748  SUBROUTINE Register_SwapField_gen_u(FieldS,FieldR,ll,old_dist,new_dist,Up,Down,a_request)
    749749  USE parallel
    750   USE dimensions
     750  USE dimensions_mod
    751751      IMPLICIT NONE
    752752   
    … …  
    801801  SUBROUTINE Register_SwapField_gen_v(FieldS,FieldR,ll,old_dist,new_dist,Up,Down,a_request)
    802802  USE parallel
    803   USE dimensions
     803  USE dimensions_mod
    804804    IMPLICIT NONE
    805805   
    … …  
    860860 
    861861  subroutine Register_Hallo(Field,ij,ll,RUp,Rdown,SUp,SDown,a_request)
    862   USE dimensions
     862  USE dimensions_mod
    863863      implicit none
    864864
    … …  
    927927
    928928  subroutine Register_Hallo_u(Field,ll,RUp,Rdown,SUp,SDown,a_request)
    929   USE dimensions
     929  USE dimensions_mod
    930930      implicit none
    931931#ifdef CPP_MPI
    … …  
    992992
    993993  subroutine Register_Hallo_v(Field,ll,RUp,Rdown,SUp,SDown,a_request)
    994   USE dimensions
     994  USE dimensions_mod
    995995      implicit none
    996996#ifdef CPP_MPI
    … …  
    10571057   
    10581058    subroutine SendRequest(a_Request)
    1059     USE dimensions
     1059    USE dimensions_mod
    10601060      implicit none
    10611061
    … …  
    11811181   
    11821182   subroutine WaitRequest(a_Request)
    1183    USE dimensions
     1183   USE dimensions_mod
    11841184   implicit none
    11851185   
    … …  
    12751275     
    12761276   subroutine WaitSendRequest(a_Request)
    1277    USE dimensions
     1277   USE dimensions_mod
    12781278   implicit none
    12791279   
    … …  
    13311331   
    13321332   subroutine WaitRecvRequest(a_Request)
    1333    USE dimensions
     1333   USE dimensions_mod
    13341334   implicit none
    13351335   
    … …  
    14121412   
    14131413    subroutine CopyField(FieldS,FieldR,ij,ll,jj_Nb_New)
    1414     USE dimensions
     1414    USE dimensions_mod
    14151415 
    14161416      implicit none
    … …  
    14501450
    14511451  subroutine CopyFieldHallo(FieldS,FieldR,ij,ll,jj_Nb_New,Up,Down)
    1452   USE dimensions
     1452  USE dimensions_mod
    14531453 
    14541454      implicit none
    … …  
    14901490
    14911491   subroutine Gather_field_u(field_loc,field_glo,ll)
    1492    USE dimensions
     1492   USE dimensions_mod
    14931493   implicit none
    14941494     integer :: ll
    … …  
    15131513       
    15141514   subroutine Gather_field_v(field_loc,field_glo,ll)
    1515    USE dimensions
     1515   USE dimensions_mod
    15161516   implicit none
    15171517     integer :: ll
    … …  
    15411541     
    15421542   subroutine Scatter_field_u(field_glo,field_loc,ll)
    1543    USE dimensions
     1543   USE dimensions_mod
    15441544   implicit none
    15451545     integer :: ll
    … …  
    15751575
    15761576   subroutine Scatter_field_v(field_glo,field_loc,ll)
    1577    USE dimensions
     1577   USE dimensions_mod
    15781578   implicit none
    15791579     integer :: ll
Note: See TracChangeset for help on using the changeset viewer.