Ignore:
Timestamp:
Jun 22, 2007, 2:46:23 PM (17 years ago)
Author:
Laurent Fairhead
Message:

Modifications suite a la transformation des fichiers include pour
qu'ils soient compatibles a la fois au format fixe et au format libre
Un bon nombre de fichier *.inc du coup disparaissent
LF

Location:
LMDZ4/trunk/libf/dyn3dpar
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • LMDZ4/trunk/libf/dyn3dpar/bands.F90

    r774 r792  
    3333    implicit none
    3434
    35     include "dimensions90.h"
    36 !#include "paramet90.h"   
     35    include "dimensions.h"
    3736      integer :: i,j
    3837      character (len=4) :: siim,sjjm,sllm,sproc
    … …  
    9392     USE mod_phys_lmdz_para, ONLY : jj_para_begin,jj_para_end
    9493     IMPLICIT NONE
    95      INCLUDE 'dimensions90.h'   
     94     INCLUDE 'dimensions.h'   
    9695     INTEGER :: i
    9796       
    … …  
    376375    USE parallel
    377376    implicit none
    378     include "dimensions90.h"
     377    include "dimensions.h"
    379378
    380379      integer :: i,j

  • LMDZ4/trunk/libf/dyn3dpar/control.h

    r764 r792  
    22! $Header$
    33!
    4 c-----------------------------------------------------------------------
    5 c INCLUDE 'control.h'
     4!
     5!  ATTENTION!!!!: ce fichier include est compatible format fixe/format libre
     6!                 veillez à n'utiliser que des ! pour les commentaires
     7!                 et à bien positionner les & des lignes de continuation
     8!                 (les placer en colonne 6 et en colonne 73)
     9!
     10!-----------------------------------------------------------------------
     11! INCLUDE 'control.h'
    612
    7       COMMON/control/nday,day_step,
    8      .              iperiod,iapp_tracvl,iconser,iecri,idissip,iphysiq ,
    9      .              periodav,ecritphy,iecrimoy,dayref,anneeref,
    10      .              raz_date,offline,ip_ebil_dyn
     13      COMMON/control/nday,day_step,                                     &
     14     &              iperiod,iapp_tracvl,iconser,iecri,idissip,iphysiq , &
     15     &              periodav,ecritphy,iecrimoy,dayref,anneeref,         &
     16     &              raz_date,offline,ip_ebil_dyn
    1117
    12       INTEGER   nday,day_step,iperiod,iapp_tracvl,iconser,iecri,
    13      .          idissip,iphysiq,iecrimoy,dayref,anneeref, raz_date,
    14      .          ip_ebil_dyn
     18      INTEGER   nday,day_step,iperiod,iapp_tracvl,iconser,iecri,        &
     19     &          idissip,iphysiq,iecrimoy,dayref,anneeref, raz_date      &
     20     &          ,ip_ebil_dyn
    1521      REAL periodav, ecritphy
    1622      logical offline
    1723
    18 c-----------------------------------------------------------------------
     24!-----------------------------------------------------------------------

  • LMDZ4/trunk/libf/dyn3dpar/mod_hallo.F90

    r764 r792  
    119119  implicit none
    120120
    121 #include "dimensions90.h"
    122 #include "paramet90.h"   
     121#include "dimensions.h"
     122#include "paramet.h"   
    123123    include 'mpif.h'
    124124   
    … …  
    141141  implicit none
    142142
    143 #include "dimensions90.h"
    144 #include "paramet90.h"   
     143#include "dimensions.h"
     144#include "paramet.h"   
    145145    include 'mpif.h'
    146146   
    … …  
    166166 
    167167      implicit none
    168 #include "dimensions90.h"
    169 #include "paramet90.h"   
     168#include "dimensions.h"
     169#include "paramet.h"   
    170170    include 'mpif.h'
    171171   
    … …  
    215215 
    216216      implicit none
    217 #include "dimensions90.h"
    218 #include "paramet90.h"   
     217#include "dimensions.h"
     218#include "paramet.h"   
    219219    include 'mpif.h'
    220220   
    … …  
    268268 
    269269      implicit none
    270 #include "dimensions90.h"
    271 #include "paramet90.h"   
     270#include "dimensions.h"
     271#include "paramet.h"   
    272272    include 'mpif.h'
    273273   
    … …  
    334334      implicit none
    335335
    336 #include "dimensions90.h"
    337 #include "paramet90.h"
     336#include "dimensions.h"
     337#include "paramet.h"
    338338      include 'mpif.h'
    339339
    … …  
    423423   implicit none
    424424   
    425 #include "dimensions90.h"
    426 #include "paramet90.h"
     425#include "dimensions.h"
     426#include "paramet.h"
    427427      include 'mpif.h'   
    428428     
    … …  
    505505   implicit none
    506506   
    507 #include "dimensions90.h"
    508 #include "paramet90.h"
     507#include "dimensions.h"
     508#include "paramet.h"
    509509      include 'mpif.h'   
    510510     
    … …  
    546546   implicit none
    547547   
    548 #include "dimensions90.h"
    549 #include "paramet90.h"
     548#include "dimensions.h"
     549#include "paramet.h"
    550550      include 'mpif.h'   
    551551     
    … …  
    610610 
    611611      implicit none
    612 #include "dimensions90.h"
    613 #include "paramet90.h"   
     612#include "dimensions.h"
     613#include "paramet.h"   
    614614    include 'mpif.h'
    615615   
    … …  
    644644 
    645645      implicit none
    646 #include "dimensions90.h"
    647 #include "paramet90.h"   
     646#include "dimensions.h"
     647#include "paramet.h"   
    648648    include 'mpif.h'
    649649   

  • LMDZ4/trunk/libf/dyn3dpar/mod_interface_dyn_phys.F90

    r774 r792  
    99    USE mod_phys_lmdz_mpi_data
    1010    IMPLICIT NONE
    11     include 'dimensions90.h'   
     11    include 'dimensions.h'   
    1212   
    1313    INTEGER :: i,j,k

  • LMDZ4/trunk/libf/dyn3dpar/parallel.F90

    r785 r792  
    3434     
    3535      include 'mpif.h'
    36 #include "dimensions90.h"
    37 #include "paramet90.h"
     36#include "dimensions.h"
     37#include "paramet.h"
    3838
    3939#ifdef CPP_COUPLE
    … …  
    114114    implicit none
    115115
    116 #include "dimensions90.h"
    117 #include "paramet90.h"
     116#include "dimensions.h"
     117#include "paramet.h"
    118118
    119119      INTEGER,dimension(0:MPI_Size-1) :: jj_Nb_New
    … …  
    150150    implicit none
    151151
    152 #include "dimensions90.h"
    153 #include "paramet90.h"
     152#include "dimensions.h"
     153#include "paramet.h"
    154154      integer :: ierr
    155155      integer :: i
    … …  
    174174    implicit none
    175175
    176 #include "dimensions90.h"
    177 #include "paramet90.h"
     176#include "dimensions.h"
     177#include "paramet.h"
    178178
    179179      integer, intent(in) :: ij,ll,row
    … …  
    197197    implicit none
    198198
    199 #include "dimensions90.h"
    200 #include "paramet90.h"
     199#include "dimensions.h"
     200#include "paramet.h"
    201201
    202202      integer, intent(in) :: ij,ll,row
    … …  
    221221    USE Vampir
    222222    implicit none
    223 #include "dimensions90.h"
    224 #include "paramet90.h"   
     223#include "dimensions.h"
     224#include "paramet.h"   
    225225    include 'mpif.h'
    226226   
    … …  
    325325    subroutine Gather_Field(Field,ij,ll,rank)
    326326    implicit none
    327 #include "dimensions90.h"
    328 #include "paramet90.h"   
     327#include "dimensions.h"
     328#include "paramet.h"   
    329329    include 'mpif.h'
    330330   
    … …  
    393393    subroutine AllGather_Field(Field,ij,ll)
    394394    implicit none
    395 #include "dimensions90.h"
    396 #include "paramet90.h"   
     395#include "dimensions.h"
     396#include "paramet.h"   
    397397    include 'mpif.h'
    398398   
    … …  
    408408   subroutine Broadcast_Field(Field,ij,ll,rank)
    409409    implicit none
    410 #include "dimensions90.h"
    411 #include "paramet90.h"   
     410#include "dimensions.h"
     411#include "paramet.h"   
    412412    include 'mpif.h'
    413413   
    … …  
    425425  Subroutine verif_hallo(Field,ij,ll,up,down)
    426426    implicit none
    427 #include "dimensions90.h"
    428 #include "paramet90.h"   
     427#include "dimensions.h"
     428#include "paramet.h"   
    429429    include 'mpif.h'
    430430   

  • LMDZ4/trunk/libf/dyn3dpar/paramet.h

    r774 r792  
    22! $Header$
    33!
    4 c-----------------------------------------------------------------------
    5 c   INCLUDE 'paramet.h'
     4!
     5!  ATTENTION!!!!: ce fichier include est compatible format fixe/format libre
     6!                 veillez  n'utiliser que des ! pour les commentaires
     7!                 et  bien positionner les & des lignes de continuation
     8!                 (les placer en colonne 6 et en colonne 73)
     9!
     10!
     11!-----------------------------------------------------------------------
     12!   INCLUDE 'paramet.h'
    613
    714      INTEGER  iip1,iip2,iip3,jjp1,llmp1,llmp2,llmm1
    … …  
    1017      INTEGER jcfil,jcfllm
    1118
    12       PARAMETER( iip1= iim+1-1/iim,iip2=iim+2,iip3=iim+3
    13      s    ,jjp1=jjm+1-1/jjm)
     19      PARAMETER( iip1= iim+1-1/iim,iip2=iim+2,iip3=iim+3                &
     20     &    ,jjp1=jjm+1-1/jjm)
    1421      PARAMETER( llmp1 = llm+1,  llmp2 = llm+2, llmm1 = llm-1 )
    1522      PARAMETER( kftd  = iim/2 -ndm )
    … …  
    2027      PARAMETER( jcfil=jjm/2+5, jcfllm=jcfil*llm )
    2128
    22 c-----------------------------------------------------------------------
     29!-----------------------------------------------------------------------

  • LMDZ4/trunk/libf/dyn3dpar/times.F90

    r774 r792  
    2727    use parallel
    2828    implicit none
    29 #include "dimensions90.h"
    30 #include "paramet90.h"
     29#include "dimensions.h"
     30#include "paramet.h"
    3131   
    3232    max_size=jjm+1
Note: See TracChangeset for help on using the changeset viewer.