Changeset 1080


Ignore:
Timestamp:
Oct 28, 2013, 1:52:54 PM (11 years ago)
Author:
slebonnois
Message:

SL: patch for Titan (optc* routines) + modifs for cpdet module in dyn3dpar to avoid compilation problems

Location:
trunk
Files:
6 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/LMDZ.COMMON/libf/dyn3dpar/calfis_p.F

    r1076 r1080  
    3939      USE infotrac
    4040      USE control_mod
    41       USE cpdet_mod, only: tpot2t_p, t2tpot_p
     41      USE cpdet_p_mod, only: tpot2t_p, t2tpot_p
    4242
    4343! used only for zonal averages

  • trunk/LMDZ.COMMON/libf/dyn3dpar/cpdet_p_mod.F90

    r1075 r1080  
    1 module cpdet_mod
     1module cpdet_p_mod
    22
    33implicit none
    … …  
    301301!======================================================================
    302302!======================================================================
    303 end module cpdet_mod
     303end module cpdet_p_mod

  • trunk/LMDZ.COMMON/libf/dyn3dpar/gcm.F

    r1037 r1080  
    2828     &                       ok_dyn_ins,ok_dyn_ave,iecri,periodav,
    2929     &                       less1day,fractday,ndynstep,nsplit_phys
    30       use cpdet_mod, only: ini_cpdet
     30      use cpdet_p_mod, only: ini_cpdet
    3131
    3232

  • trunk/LMDZ.COMMON/libf/dyn3dpar/leapfrog_p.F

    r1056 r1080  
    2626     &                       ok_dyn_ins,output_grads_dyn,
    2727     &                       iapp_tracvl
    28        use cpdet_mod, only: cpdet,tpot2t_glo_p,t2tpot_glo_p
     28       use cpdet_p_mod, only: cpdet,tpot2t_glo_p,t2tpot_glo_p
    2929       use sponge_mod_p, only: callsponge,mode_sponge,sponge_p
    3030       use comuforc_h

  • trunk/LMDZ.COMMON/libf/dyn3dpar/vlspltqs_p.F

    r1019 r1080  
    2525      USE mod_hallo
    2626      USE VAMPIR
    27       use cpdet_mod, only: tpot2t_glo_p
     27      use cpdet_p_mod, only: tpot2t_glo_p
    2828      IMPLICIT NONE
    2929

  • trunk/LMDZ.TITAN/libf/phytitan/optci.F

    r1056 r1080  
    266266        endif
    267267       
    268         COSBI(ig,:,:)  = COSBI_1pt(:,:)
    269         WBARI(ig,:,:)  = WBARI_1pt(:,:)
     268        COSBI(ig,:,:)  = MAX(MIN(COSBI_1pt(:,:),0.999999),1e-6)
     269        WBARI(ig,:,:)  = MAX(MIN(WBARI_1pt(:,:),0.999999),1e-6)
    270270        DTAUI(ig,:,:)  = DTAUI_1pt(:,:)
    271271        TAUI(ig,:,:)   = TAUI_1pt(:,:)
    272272
    273         COSBIP(ig,:,:)  = COSBIP_1pt(:,:)
    274         WBARIP(ig,:,:)  = WBARIP_1pt(:,:)
     273        COSBIP(ig,:,:)  = MAX(MIN(COSBIP_1pt(:,:),0.999999),1e-6)
     274        WBARIP(ig,:,:)  = MAX(MIN(WBARIP_1pt(:,:),0.999999),1e-6)
    275275        DTAUIP(ig,:,:)  = DTAUIP_1pt(:,:)
    276276        TAUIP(ig,:,:)   = TAUIP_1pt(:,:)

  • trunk/LMDZ.TITAN/libf/phytitan/optcv.F

    r1056 r1080  
    201201        endif
    202202       
    203         COSBV(ig,:,:,:)= COSBV_1pt(:,:,:)
    204         WBARV(ig,:,:,:)= WBARV_1pt(:,:,:) 
     203        COSBV(ig,:,:,:)= MAX(MIN(COSBV_1pt(:,:,:),0.999999),1e-6)
     204        WBARV(ig,:,:,:)= WBARV_1pt(:,:,:),0.999999),1e-6)
    205205        DTAUV(ig,:,:,:)= DTAUV_1pt(:,:,:)
    206206        TAUV(ig,:,:,:) = TAUV_1pt(:,:,:)
    207207
    208         COSBVP(ig,:,:,:)= COSBVP_1pt(:,:,:)
    209         WBARVP(ig,:,:,:)= WBARVP_1pt(:,:,:)
     208        COSBVP(ig,:,:,:)= MAX(MIN(COSBVP_1pt(:,:,:),0.999999),1e-6)
     209        WBARVP(ig,:,:,:)= MAX(MIN(WBARVP_1pt(:,:,:),0.999999),1e-6)
    210210        DTAUVP(ig,:,:,:)= DTAUVP_1pt(:,:,:)
    211211        TAUVP(ig,:,:,:) = TAUVP_1pt(:,:,:)
Note: See TracChangeset for help on using the changeset viewer.