Changeset 1397 for LMDZ4/branches


Ignore:
Timestamp:
Jun 2, 2010, 2:57:39 PM (14 years ago)
Author:
Ehouarn Millour
Message:

Enable starting a SW run from a start.nc file.

Also fix (for picky compilers) the fact that the last argument of init_phys_lmdz must be an array (of a single element in seq mode).

EM

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

Legend:

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

    r1393 r1397  
    184184      if (planet_type.eq."earth") then
    185185#ifdef CPP_EARTH
    186       CALL Init_Phys_lmdz(iim,jjp1,llm,1,(jjm-1)*iim+2)
     186      CALL Init_Phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))
    187187      call InitComgeomphy
    188188#endif
     
    244244      if (read_start) then
    245245      ! we still need to run iniacademic to initialize some
    246       ! constants & fields, if we run the 'newtonian' case:
    247         if (iflag_phys.eq.2) then
     246      ! constants & fields, if we run the 'newtonian' or 'SW' cases:
     247        if (iflag_phys.ne.1) then
    248248          CALL iniacademic(vcov,ucov,teta,q,masse,ps,phis,time_0)
    249249        endif
     
    254254         CALL dynetat0("start.nc",vcov,ucov,
    255255     &              teta,q,masse,ps,phis, time_0)
    256 #endif
     256#else
    257257        ! SW model also has Earth-format start files
    258258        ! (but can be used without the CPP_EARTH directive)
     
    261261     &              teta,q,masse,ps,phis, time_0)
    262262          endif
    263        
     263#endif
    264264        endif ! of if (planet_type.eq."earth")
    265265       
  • LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3dpar/gcm.F

    r1393 r1397  
    270270      if (read_start) then
    271271      ! we still need to run iniacademic to initialize some
    272       ! constants & fields, if we run the 'newtonian' case:
    273         if (iflag_phys.eq.2) then
     272      ! constants & fields, if we run the 'newtonian' or 'SW' cases:
     273        if (iflag_phys.ne.1) then
    274274          CALL iniacademic(vcov,ucov,teta,q,masse,ps,phis,time_0)
    275275        endif
     
    280280         CALL dynetat0("start.nc",vcov,ucov,
    281281     &              teta,q,masse,ps,phis, time_0)
    282 #endif
     282#else
    283283        ! SW model also has Earth-format start files
    284284        ! (but can be used without the CPP_EARTH directive)
     
    287287     &              teta,q,masse,ps,phis, time_0)
    288288          endif
    289        
     289#endif
    290290        endif ! of if (planet_type.eq."earth")
    291291c       write(73,*) 'ucov',ucov
Note: See TracChangeset for help on using the changeset viewer.