Changeset 769


Ignore:
Timestamp:
Sep 4, 2012, 3:27:11 PM (12 years ago)
Author:
acolaitis
Message:

MESOSCALE. minor modifications to allow compilation with new physics + nesting with latest svn revision

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LMDZ.MARS/libf/phymars/nlte_aux.F

    r757 r769  
    432432
    433433      if ( wvoigt .lt. 0.0d0 ) then
    434          write (*,*) ' Subroutine WE/ Error in Voift EQS calculation '
    435          write (*,*) '  WL, WD, X, Y = ', wl, wd, x, y
    436          stop '  ERROR : Imaginary EQW. Revise spectral data. '
     434       write (*,*) ' Subroutine WE/ Error in Voift EQS calculation'
     435       write (*,*) '  WL, WD, X, Y = ', wl, wd, x, y
     436       stop '  ERROR : Imaginary EQW. Revise spectral data. '
    437437      endif
    438438

  • trunk/LMDZ.MARS/libf/phymars/physiq.F

    r758 r769  
    18391839     &                  tsurf)
    18401840         call WRITEDIAGFI(ngrid,"ps","surface pressure","Pa",2,ps)
    1841          call WRITEDIAGFI(ngrid,"co2ice","co2 ice thickness","kg.m-2",2,
    1842      &                  co2ice)
     1841         call WRITEDIAGFI(ngrid,"co2ice","co2 ice thickness"
     1842     &                                         ,"kg.m-2",2,co2ice)
    18431843
    18441844         call WRITEDIAGFI(ngrid,"temp7","temperature in layer 7",
    … …  
    22002200!        call WRITEDIAGFI(ngridmx,'lw_htrt','lw heat. rate',
    22012201!     &                   'w.m-2',1,zdtlw/zpopsk)
    2202          call WRITEDIAGFI(ngrid,"co2ice","co2 ice thickness","kg.m-2",0,
    2203      &                  co2ice)
     2202         call WRITEDIAGFI(ngrid,"co2ice","co2 ice thickness"
     2203     &                                   ,"kg.m-2",0,co2ice)
    22042204
    22052205! or output in diagfi.nc (for testphys1d)
    … …  
    23002300     &                         'nbr/m2',0,Nccntot)
    23012301
    2302              call WRITEDIAGFI(ngridmx,'zdqsed_dustq','sedimentation q',
    2303      &                   'kg.m-2.s-1',1,zdqsed(1,:,igcm_dust_mass))
    2304              call WRITEDIAGFI(ngridmx,'zdqsed_dustN','sedimentation N',
    2305      &                'Nbr.m-2.s-1',1,zdqsed(1,:,igcm_dust_number))
     2302             call WRITEDIAGFI(ngridmx,'zdqsed_dustq'
     2303     & ,'sedimentation q','kg.m-2.s-1',1,zdqsed(1,:,igcm_dust_mass))
     2304             call WRITEDIAGFI(ngridmx,'zdqsed_dustN'
     2305     &,'sedimentation N','Nbr.m-2.s-1',1,
     2306     &                                 zdqsed(1,:,igcm_dust_number))
    23062307
    23072308           else ! of if (scavenging)

  • trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/libf/generate2

    r695 r769  
    11# script
    22# execute: find * -exec generate2 {} \;
    3 # change number sed -e s/d2/d3/g generate2 > generate3
     3# change number sed -e s/d2/d2/g generate2 > generate3
    44
    55sed -e s/'[cC][aA][lL][lL] '/'call d2_'/g ${1} | sed -e s/'call d2_[aA][bB][oO][rR][tT]'/'call ABORT'/g | sed -e s/'call d2_[eE][xX][iI][tT]'/'call EXIT'/g | sed -e s/'firstcall d2_'/'firstcall '/g | sed -e s/'lastcall d2_'/'lastcall '/g | sed -e s/'[sS][uU][bB][rR][oO][uU][tT][iI][nN][eE] '/'subroutine d2_'/g | sed -e s/'callphys.def'/'callphysd2_.def '/g | sed -e s/'diagfi.nc'/'diagfid2_.nc'/g | sed -e s/'[iI][nN][cC][lL][uU][dD][eE] "'/'include "d2_'/g | sed -e s/"[iI][nN][cC][lL][uU][dD][eE] '"/"include 'd2_"/g | sed -e s+"[cC][oO][mM][mM][oO][nN]/"+"common/d2_"+g | sed -e s+"[cC][oO][mM][mM][oO][nN] /"+"common /d2_"+g | sed -e s+"d2_netcdf.inc"+"netcdf.inc"+g > d2_${1}_temp
    … …  
    1515sed -e s+'d2_meso_inc/'+'meso_inc/'+g d2_${1}_temp > d2_${1}_temp2 ; \mv d2_${1}_temp2 d2_${1}_temp
    1616sed -e s/'[uU][sS][eE] ioipsl_getincom'/'USE d2_ioipsl_getincom'/g d2_${1}_temp > d2_${1}_temp2 ; \mv d2_${1}_temp2 d2_${1}_temp
     17sed -e s/'[uU][sS][eE] updaterad'/'USE d2_updaterad'/g d2_${1}_temp > d2_${1}_temp2 ; \mv d2_${1}_temp2 d2_${1}_temp
    1718sed -e s/'PUBLIC :: getin, getin_dump'/'PUBLIC :: d2_getin, d2_getin_dump'/g d2_${1}_temp > d2_${1}_temp2 ; \mv d2_${1}_temp2 d2_${1}_temp
    1819sed -e s/' getinrs, getinr1d, getinr2d,'/' d2_getinrs, d2_getinr1d, d2_getinr2d,'/g d2_${1}_temp > d2_${1}_temp2 ; \mv d2_${1}_temp2 d2_${1}_temp
    … …  
    2829
    2930case ${1} in
    30    'nlte_aux.F') sed -e s/'iaa_we'/'d2_iaa_we'/g d2_${1}_temp | sed -e s/'simrul'/'d2_simrul'/g | sed -e s/'iaa_f'/'d2_iaa_f'/g | sed -e s/'iaa_fi'/'d2_iaa_fi'/g | sed -e s/'voigtf'/'d2_voigtf'/g | sed -e s/'planckdp'/'d2_planckdp'/g | sed -e s/'bandid'/'d2_bandid'/g > d2_${1}_temp2 ; \mv d2_${1}_temp2 d2_${1}_temp ;;
     31   'nlte_aux.F') sed -e s/'iaa_we'/'d2_iaa_we'/g d2_${1}_temp | sed -e s/'simrul'/'d2_simrul'/g | sed -e s/'iaa_f'/'d2_iaa_f'/g | sed -e s/'iaa_fi'/'d2_iaa_fi'/g | sed -e s/'voigtf'/'d2_voigtf'/g | sed -e s/'planckdp'/'d2_planckdp'/g | sed -e s/'we_clean'/'d2_we_clean'/g | sed -e s/'bandid'/'d2_bandid'/g > d2_${1}_temp2 ; \mv d2_${1}_temp2 d2_${1}_temp ;;
    3132   'nlte_tcool.F') sed -e s/'planckdp'/'d2_planckdp'/g d2_${1}_temp | sed -e s/'hrkday_convert'/'d2_hrkday_convert'/g > d2_${1}_temp2 ; \mv d2_${1}_temp2 d2_${1}_temp ;;
    3233   'nlte_calc.F') sed -e s/'bandid'/'d2_bandid'/g d2_${1}_temp > d2_${1}_temp2 ; \mv d2_${1}_temp2 d2_${1}_temp ;;

  • trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/libf/generate3

    r695 r769  
    1515sed -e s+'d3_meso_inc/'+'meso_inc/'+g d3_${1}_temp > d3_${1}_temp2 ; \mv d3_${1}_temp2 d3_${1}_temp
    1616sed -e s/'[uU][sS][eE] ioipsl_getincom'/'USE d3_ioipsl_getincom'/g d3_${1}_temp > d3_${1}_temp2 ; \mv d3_${1}_temp2 d3_${1}_temp
     17sed -e s/'[uU][sS][eE] updaterad'/'USE d3_updaterad'/g d3_${1}_temp > d3_${1}_temp2 ; \mv d3_${1}_temp2 d3_${1}_temp
    1718sed -e s/'PUBLIC :: getin, getin_dump'/'PUBLIC :: d3_getin, d3_getin_dump'/g d3_${1}_temp > d3_${1}_temp2 ; \mv d3_${1}_temp2 d3_${1}_temp
    1819sed -e s/' getinrs, getinr1d, getinr2d,'/' d3_getinrs, d3_getinr1d, d3_getinr2d,'/g d3_${1}_temp > d3_${1}_temp2 ; \mv d3_${1}_temp2 d3_${1}_temp
    … …  
    2829
    2930case ${1} in
    30    'nlte_aux.F') sed -e s/'iaa_we'/'d3_iaa_we'/g d3_${1}_temp | sed -e s/'simrul'/'d3_simrul'/g | sed -e s/'iaa_f'/'d3_iaa_f'/g | sed -e s/'iaa_fi'/'d3_iaa_fi'/g | sed -e s/'voigtf'/'d3_voigtf'/g | sed -e s/'planckdp'/'d3_planckdp'/g | sed -e s/'bandid'/'d3_bandid'/g > d3_${1}_temp2 ; \mv d3_${1}_temp2 d3_${1}_temp ;;
     31   'nlte_aux.F') sed -e s/'iaa_we'/'d3_iaa_we'/g d3_${1}_temp | sed -e s/'simrul'/'d3_simrul'/g | sed -e s/'iaa_f'/'d3_iaa_f'/g | sed -e s/'iaa_fi'/'d3_iaa_fi'/g | sed -e s/'voigtf'/'d3_voigtf'/g | sed -e s/'planckdp'/'d3_planckdp'/g | sed -e s/'we_clean'/'d3_we_clean'/g | sed -e s/'bandid'/'d3_bandid'/g > d3_${1}_temp2 ; \mv d3_${1}_temp2 d3_${1}_temp ;;
    3132   'nlte_tcool.F') sed -e s/'planckdp'/'d3_planckdp'/g d3_${1}_temp | sed -e s/'hrkday_convert'/'d3_hrkday_convert'/g > d3_${1}_temp2 ; \mv d3_${1}_temp2 d3_${1}_temp ;;
    3233   'nlte_calc.F') sed -e s/'bandid'/'d3_bandid'/g d3_${1}_temp > d3_${1}_temp2 ; \mv d3_${1}_temp2 d3_${1}_temp ;;
    … …  
    3435   'nuclea.F')  sed -e s/'fshape'/'d3_fshape'/g d3_${1}_temp | sed -e s/'d3_fshapesimple'/'fshapesimple'/g | sed -e s/'zed3_fshape'/'zefshape'/g > d3_${1}_temp2 ; \mv d3_${1}_temp2 d3_${1}_temp ;;
    3536esac
    36 
    3737# Cleanup
    3838

  • trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/libf/generate4

    r695 r769  
    1515sed -e s+'d4_meso_inc/'+'meso_inc/'+g d4_${1}_temp > d4_${1}_temp2 ; \mv d4_${1}_temp2 d4_${1}_temp
    1616sed -e s/'[uU][sS][eE] ioipsl_getincom'/'USE d4_ioipsl_getincom'/g d4_${1}_temp > d4_${1}_temp2 ; \mv d4_${1}_temp2 d4_${1}_temp
     17sed -e s/'[uU][sS][eE] updaterad'/'USE d4_updaterad'/g d4_${1}_temp > d4_${1}_temp2 ; \mv d4_${1}_temp2 d4_${1}_temp
    1718sed -e s/'PUBLIC :: getin, getin_dump'/'PUBLIC :: d4_getin, d4_getin_dump'/g d4_${1}_temp > d4_${1}_temp2 ; \mv d4_${1}_temp2 d4_${1}_temp
    1819sed -e s/' getinrs, getinr1d, getinr2d,'/' d4_getinrs, d4_getinr1d, d4_getinr2d,'/g d4_${1}_temp > d4_${1}_temp2 ; \mv d4_${1}_temp2 d4_${1}_temp
    … …  
    2728# Functions
    2829
    29 case ${1} in 
    30    'nlte_aux.F') sed -e s/'iaa_we'/'d4_iaa_we'/g d4_${1}_temp | sed -e s/'simrul'/'d4_simrul'/g | sed -e s/'iaa_f'/'d4_iaa_f'/g | sed -e s/'iaa_fi'/'d4_iaa_fi'/g | sed -e s/'voigtf'/'d4_voigtf'/g | sed -e s/'planckdp'/'d4_planckdp'/g | sed -e s/'bandid'/'d4_bandid'/g > d4_${1}_temp2 ; \mv d4_${1}_temp2 d4_${1}_temp ;;
     30case ${1} in
     31   'nlte_aux.F') sed -e s/'iaa_we'/'d4_iaa_we'/g d4_${1}_temp | sed -e s/'simrul'/'d4_simrul'/g | sed -e s/'iaa_f'/'d4_iaa_f'/g | sed -e s/'iaa_fi'/'d4_iaa_fi'/g | sed -e s/'voigtf'/'d4_voigtf'/g | sed -e s/'planckdp'/'d4_planckdp'/g | sed -e s/'we_clean'/'d4_we_clean'/g | sed -e s/'bandid'/'d4_bandid'/g > d4_${1}_temp2 ; \mv d4_${1}_temp2 d4_${1}_temp ;;
    3132   'nlte_tcool.F') sed -e s/'planckdp'/'d4_planckdp'/g d4_${1}_temp | sed -e s/'hrkday_convert'/'d4_hrkday_convert'/g > d4_${1}_temp2 ; \mv d4_${1}_temp2 d4_${1}_temp ;;
    3233   'nlte_calc.F') sed -e s/'bandid'/'d4_bandid'/g d4_${1}_temp > d4_${1}_temp2 ; \mv d4_${1}_temp2 d4_${1}_temp ;;
Note: See TracChangeset for help on using the changeset viewer.