Changeset 1415


Ignore:
Timestamp:
Apr 14, 2015, 9:46:47 AM (10 years ago)
Author:
milmd
Message:

Update newstart and start2archive programs of LMDZ.GENERIC and LMDZ.MARS to the new organization.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LMDZ.COMMON/libf/dyn3d_common/ugeostr.F90

    r1300 r1415  
    4747     ENDDO
    4848  ENDDO
    49   call dump2d(jjm,llm,um,'Vent-u geostrophique')
    5049
    5150  !   calcul des champ de vent:

  • trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd/newstart.F

    r1403 r1415  
    1515c=======================================================================
    1616
    17       use infotrac, only: iniadvtrac, nqtot, tname
     17      use infotrac, only: infotrac_init, nqtot, tname
    1818      USE tracer_h, ONLY: igcm_co2_ice, igcm_h2o_vap, igcm_h2o_ice
    1919      USE comsoil_h, ONLY: nsoilmx, layer, mlayer, inertiedat
    … …  
    2525!      USE ioipsl_getincom, only: getin
    2626      USE ioipsl_getincom_p, only: getin_p
    27       use control_mod, only: day_step, iphysiq, anneeref
     27      use control_mod, only: day_step, iphysiq, anneeref, planet_type
    2828      use phyredem, only: physdem0, physdem1
    2929      use iostart, only: open_startphy
    … …  
    198198      call initcomgeomphy
    199199! Load tracer number and names:
    200       call iniadvtrac(nqtot,numvanle)
     200!      call iniadvtrac(nqtot,numvanle)
     201      call infotrac_init
    201202! allocate arrays
    202203      allocate(q(iip1,jjp1,llm,nqtot))
    203204      allocate(qsurf(ngridmx,nqtot))
     205     
     206      planet_type="generic"
    204207
    205208c=======================================================================
    … …  
    16371640
    16381641         
    1639       CALL dynredem0("restart.nc",day_ini,anneeref,phis,nqtot)
    1640       CALL dynredem1("restart.nc",0.0,vcov,ucov,teta,q,nqtot,masse,ps)
     1642      CALL dynredem0("restart.nc",day_ini,phis)
     1643      CALL dynredem1("restart.nc",0.0,vcov,ucov,teta,q,masse,ps)
    16411644C
    16421645C Ecriture etat initial physique
    … …  
    16461649     &              nqtot,dtphys,real(day_ini),0.0,
    16471650     &              airefi,albfi,ithfi,zmea,zstd,zsig,zgam,zthe)
    1648       call physdem1("restartfi.nc",nsoilmx,ngridmx,llm,nq,
     1651      call physdem1("restartfi.nc",nsoilmx,ngridmx,llm,nqtot,
    16491652     &                dtphys,real(day_ini),
    16501653     &                tsurf,tsoil,emis,q2,qsurf,

  • trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd/start2archive.F

    r1403 r1415  
    1919c=======================================================================
    2020
    21       use infotrac, only: iniadvtrac, nqtot, tname
     21      use infotrac, only: infotrac_init, nqtot, tname
    2222      USE comsoil_h
    2323      USE comgeomfi_h, ONLY: lati, long, area
    … …  
    2828      USE ioipsl_getincom
    2929      USE planete_mod, only: year_day
     30      USE control_mod, only: planet_type
    3031      USE callkeys_mod, ONLY: ok_slab_ocean
    3132      use filtreg_mod, only: inifilr
    … …  
    154155      IF (.not. ALLOCATED(area)) ALLOCATE(area(ngridmx))
    155156
     157      planet_type="generic"
     158
    156159c=======================================================================
    157160c Lecture des donnees
    158161c=======================================================================
    159162! Load tracer number and names:
    160       call iniadvtrac(nqtot,numvanle)
     163!      call iniadvtrac(nqtot,numvanle)
     164      call infotrac_init
    161165
    162166! allocate arrays:
    … …  
    168172
    169173      fichnom = 'start.nc'
    170       CALL dynetat0(fichnom,nqtot,vcov,ucov,teta,q,masse,
     174      CALL dynetat0(fichnom,vcov,ucov,teta,q,masse,
    171175     .       ps,phis,timedyn)
    172176

  • trunk/LMDZ.GENERIC/libf/phystd/phyetat0.F90

    r1384 r1415  
    378378      write(*,*) "phyetat0: Failed loading <",trim(txt),">"
    379379      write(*,*) "         ",trim(txt)," is set to zero"
     380      qsurf(:,iq) = 0.
    380381    else
    381382      write(*,*) "phyetat0: Surface tracer <",trim(txt),"> range:", &

  • trunk/LMDZ.MARS/libf/dyn3d/defrun_new.F

    r1399 r1415  
    11      SUBROUTINE defrun_new( tapedef, etatinit )
     2#ifndef CPP_PARA
    23c
    34c-----------------------------------------------------------------------
    … …  
    576577     &in run.def for this version... -> STOP ! '     
    577578      end if
    578 
    579       RETURN
     579#else
     580      write(*,*) "defrun_new should not be used in parallel mode!"
     581      stop
     582#endif
     583! of #ifndef CPP_PARA
    580584      END

  • trunk/LMDZ.MARS/libf/dynlonlat_phylonlat/phymars/datareadnc.F

    r1403 r1415  
    235235     .         iim, jjp1, rlonv, rlatu, zmea,zstd,zsig,zgam,zthe)
    236236
    237           CALL dump2d(iip1,jjp1,zmea,'zmea')
    238           CALL dump2d(iip1,jjp1,zstd,'zstd')
    239           CALL dump2d(iip1,jjp1,zsig,'zsig')
    240           CALL dump2d(iip1,jjp1,zgam,'zgam')
    241           CALL dump2d(iip1,jjp1,zthe,'zthe')
    242 
    243237      endif
    244238
    … …  
    274268         z0(1:iimp1*jjp1)=pfield(1:iimp1*jjp1)*.01
    275269         ! multiplied by 0.01 to have z0 in m
    276          CALL dump2d(iimp1,jjp1,z0,'z0 in m')
    277270      elseif (k.eq.1) then                    ! albedo
    278271         do i=1,iimp1*jjp1
    … …  
    300293
    301294      phisinit(1:iimp1*jjp1)=1000.*phisinit(1:iimp1*jjp1)
    302       CALL dump2d(iimp1,jjp1,phisinit,'Altitude in m')
    303295      phisinit(:)=g*phisinit(:)
    304296

  • trunk/LMDZ.MARS/libf/dynlonlat_phylonlat/phymars/newstart.F

    r1403 r1415  
    1616
    1717      use ioipsl_getincom, only: getin
    18       use infotrac, only: iniadvtrac, nqtot, tname
     18      use infotrac, only: infotrac_init, nqtot, tname
    1919      use tracer_mod, only: noms, mmol,
    2020     &                      igcm_dust_number, igcm_dust_mass,
    … …  
    2626     &                     co2ice, emis
    2727      use comsoil_h, only: inertiedat, layer, mlayer, nsoilmx, tsoil
    28       use control_mod, only: day_step, iphysiq, anneeref
     28      use control_mod, only: day_step, iphysiq, anneeref, planet_type
    2929      use phyredem, only: physdem0, physdem1
    3030      use iostart, only: open_startphy
    … …  
    179179      preff  = 610.    ! for Mars, instead of 101325. (Earth)
    180180      pa= 20           ! for Mars, instead of 500 (Earth)
     181      planet_type="mars"
    181182
    182183! initialize "serial/parallel" related stuff
    … …  
    185186
    186187! Load tracer number and names:
    187       call iniadvtrac(nqtot,numvanle)
     188!      call iniadvtrac(nqtot,numvanle)
     189      call infotrac_init
    188190! allocate arrays
    189191      allocate(q(iip1,jjp1,llm,nqtot))
    … …  
    16281630      phis(iip1,:) = phis(1,:)
    16291631
    1630       CALL inidissip ( lstardis, nitergdiv, nitergrot, niterh,
    1631      *                tetagdiv, tetagrot , tetatemp  )
     1632c      CALL inidissip ( lstardis, nitergdiv, nitergrot, niterh,
     1633c     *                tetagdiv, tetagrot , tetatemp  )
    16321634      itau=0
    16331635      if (choix_1.eq.0) then
    … …  
    16441646c    $    phi,conser,du,dv,dteta,dp,w, pbaru,pbarv, day_ini )
    16451647
    1646       CALL dynredem0("restart.nc",day_ini,anneeref,phis,nqtot)
     1648      CALL dynredem0("restart.nc",day_ini,phis)
    16471649      CALL dynredem1("restart.nc",hour_ini,vcov,ucov,teta,q,
    1648      .               nqtot,masse,ps)
     1650     .               masse,ps)
    16491651C
    16501652C Ecriture etat initial physique

  • trunk/LMDZ.MARS/libf/dynlonlat_phylonlat/phymars/start2archive.F

    r1403 r1415  
    1919c=======================================================================
    2020
    21       use infotrac, only: iniadvtrac, nqtot, tname
     21      use infotrac, only: infotrac_init, nqtot, tname
    2222      use comsoil_h, only: nsoilmx, inertiedat
    2323      use surfdat_h, only: ini_surfdat_h, qsurf
    … …  
    2525      use comgeomphy, only: initcomgeomphy
    2626      use filtreg_mod, only: inifilr
     27      use control_mod, only: planet_type
    2728      implicit none
    2829
    … …  
    120121      CALL init_phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))
    121122      call initcomgeomphy
     123      planet_type='mars'
    122124
    123125c=======================================================================
    … …  
    125127c=======================================================================
    126128! Load tracer number and names:
    127       call iniadvtrac(nqtot,numvanle)
     129!      call iniadvtrac(nqtot,numvanle)
     130      call infotrac_init
    128131
    129132! allocate arrays:
    … …  
    135138
    136139      fichnom = 'start.nc'
    137       CALL dynetat0(fichnom,nqtot,vcov,ucov,teta,q,masse,
     140      CALL dynetat0(fichnom,vcov,ucov,teta,q,masse,
    138141     .       ps,phis,timedyn)
    139142
Note: See TracChangeset for help on using the changeset viewer.