Changeset 1393


Ignore:
Timestamp:
May 27, 2010, 8:51:35 AM (15 years ago)
Author:
Ehouarn Millour
Message:

Some minor fixes for the Newtonian and Shallow Water cases:
-Some initializations were done twice, causing problems with the FFT filter.
-Some CPP_EARTH preprocessing keys should in fact be CPP_IOIPSL.

Also added some useful debugging options to 'debug' mode in arch-PW6_VARGAS.fcm

EM

Location:
LMDZ4/branches/LMDZ4V5.0-dev
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • LMDZ4/branches/LMDZ4V5.0-dev/arch/arch-PW6_VARGAS.fcm

    r1386 r1393  
    88%PROD_FFLAGS         -O5
    99%DEV_FFLAGS          -O2 -qfullpath -qinitauto=7FBFFFFF -qfloat=nans -qflttrap=overflow:zerodivide:invalid:enable -qsigtrap
    10 %DEBUG_FFLAGS        -g -qfullpath -qnooptimize -qinitauto=7FBFFFFF  -qfloat=nans -qflttrap=overflow:zerodivide:invalid:enable -qsigtrap
     10%DEBUG_FFLAGS        -g -qfullpath -qnooptimize -qinitauto=7FBFFFFF  -qfloat=nans -qflttrap=overflow:zerodivide:invalid:enable -qsigtrap -qcheck -qextchk
    1111%MPI_FFLAGS          -I/usr/lpp/ppe.poe/include/thread64
    1212%OMP_FFLAGS          -qsmp=omp

  • LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3d/fluxstokenc.F

    r1299 r1393  
    44      SUBROUTINE fluxstokenc(pbaru,pbarv,masse,teta,phi,phis,
    55     . time_step,itau )
    6 #ifdef CPP_EARTH
    7 ! This routine is designed to work for Earth and with ioipsl
     6#ifdef CPP_IOIPSL
     7! This routine is designed to work with ioipsl
    88
    99       USE IOIPSL
    … …  
    141141
    142142         iadvtr=0
    143         Print*,'ITAU auqel on stoke les fluxmasses',itau
     143        write(lunout,*)'ITAU auquel on stoke les fluxmasses',itau
    144144       
    145145        call histwrite(fluxid, 'masse', itau, massem,
    … …  
    167167#else
    168168      write(lunout,*)
    169      & 'fluxstokenc: Needs Earth physics (and ioipsl) to function'
     169     & 'fluxstokenc: Needs IOIPSL to function'
    170170#endif
    171 ! of #ifdef CPP_EARTH
     171! of #ifdef CPP_IOIPSL
    172172      RETURN
    173173      END

  • LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3d/gcm.F

    r1380 r1393  
    386386      nbetatmoy = nday / periodav + 1
    387387
     388      if (iflag_phys.eq.1) then
     389      ! these initialisations have already been done (via iniacademic)
     390      ! if running in SW or Newtonian mode
    388391c-----------------------------------------------------------------------
    389392c   Initialisation des constantes dynamiques :
    390393c   ------------------------------------------
    391       dtvr = zdtvr
    392       CALL iniconst
     394        dtvr = zdtvr
     395        CALL iniconst
    393396
    394397c-----------------------------------------------------------------------
    395398c   Initialisation de la geometrie :
    396399c   --------------------------------
    397       CALL inigeom
     400        CALL inigeom
    398401
    399402c-----------------------------------------------------------------------
    400403c   Initialisation du filtre :
    401404c   --------------------------
    402       CALL inifilr
     405        CALL inifilr
     406      endif ! of if (iflag_phys.eq.1)
    403407c
    404408c-----------------------------------------------------------------------

  • LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3dpar/calfis_p.F

    r1363 r1393  
    3434      USE dimphy
    3535      USE mod_phys_lmdz_para, mpi_root_xx=>mpi_root
     36      USE mod_interface_dyn_phys
     37      USE IOPHY
     38#endif
    3639      USE parallel, ONLY : omp_chunk, using_mpi
    37       USE mod_interface_dyn_phys
    3840      USE Write_Field
    3941      Use Write_field_p
    4042      USE Times
    41       USE IOPHY
    4243      USE infotrac
    4344      USE control_mod
    … …  
    115116c    -----------
    116117      LOGICAL  lafin
    117       REAL heure
    118 
     118!      REAL heure
     119      REAL, intent(in):: jD_cur, jH_cur
    119120      REAL pvcov(iip1,jjm,llm)
    120121      REAL pucov(iip1,jjp1,llm)
    … …  
    129130      REAL pdteta(iip1,jjp1,llm)
    130131      REAL pdq(iip1,jjp1,llm,nqtot)
     132      REAL flxw(iip1,jjp1,llm)  ! Flux de masse verticale sur la grille dynamique
    131133c
    132134      REAL pps(iip1,jjp1)
    … …  
    144146      REAL clesphy0( longcles )
    145147
    146 
     148#ifdef CPP_EARTH
    147149c    Local variables :
    148150c    -----------------
    … …  
    223225      REAL PVteta(klon,ntetaSTD)
    224226     
    225       REAL flxw(iip1,jjp1,llm)  ! Flux de masse verticale sur la grille dynamique
    226227     
    227228      REAL SSUM
    … …  
    231232      SAVE firstcal,debut
    232233c$OMP THREADPRIVATE(firstcal,debut)
    233       REAL, intent(in):: jD_cur, jH_cur
    234234     
    235235      REAL,SAVE,dimension(1:iim,1:llm):: du_send,du_recv,dv_send,dv_recv

  • LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3dpar/fluxstokenc_p.F

    r1299 r1393  
    44      SUBROUTINE fluxstokenc_p(pbaru,pbarv,masse,teta,phi,phis,
    55     . time_step,itau )
    6 #ifdef CPP_EARTH
    7 ! This routine is designed to work for Earth and with ioipsl
     6#ifdef CPP_IOIPSL
     7! This routine is designed to work with ioipsl
    88
    99       USE IOIPSL
    … …  
    202202     
    203203         iadvtr=0
    204         Print*,'ITAU auqel on stoke les fluxmasses',itau
     204        write(lunout,*)'ITAU auquel on stoke les fluxmasses',itau
    205205       
    206206        ijb=ij_begin
    … …  
    244244#else
    245245      write(lunout,*)
    246      & 'fluxstokenc: Needs Earth physics (and ioipsl) to function'
     246     & 'fluxstokenc: Needs IOIPSL to function'
    247247#endif
    248 ! of #ifdef CPP_EARTH
     248! of #ifdef CPP_IOIPSL
    249249      RETURN
    250250      END

  • LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3dpar/gcm.F

    r1384 r1393  
    401401      nbetatmoy = nday / periodav + 1
    402402
     403      if (iflag_phys.eq.1) then
     404      ! these initialisations have already been done (via iniacademic)
     405      ! if running in SW or Newtonian mode
    403406c-----------------------------------------------------------------------
    404407c   Initialisation des constantes dynamiques :
    405408c   ------------------------------------------
    406       dtvr = zdtvr
    407       CALL iniconst
     409        dtvr = zdtvr
     410        CALL iniconst
    408411
    409412c-----------------------------------------------------------------------
    410413c   Initialisation de la geometrie :
    411414c   --------------------------------
    412       CALL inigeom
     415        CALL inigeom
    413416
    414417c-----------------------------------------------------------------------
    415418c   Initialisation du filtre :
    416419c   --------------------------
    417       CALL inifilr
     420        CALL inifilr
     421      endif ! of if (iflag_phys.eq.1)
    418422c
    419423c-----------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.