Ignore:
Timestamp:
Dec 14, 2015, 11:43:09 AM (9 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2298:2396 into testing branch

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/phylmd/fonte_neige_mod.F90

    r1910 r2408  
    6363    IF (error /= 0) THEN
    6464       abort_message='Pb allocation run_off_lic'
    65        CALL abort_gcm(modname,abort_message,1)
     65       CALL abort_physic(modname,abort_message,1)
    6666    ENDIF
    6767    run_off_lic_0(:) = restart_runoff(:)
     
    7474    IF (error /= 0) THEN
    7575       abort_message='Pb allocation run_off_ter'
    76        CALL abort_gcm(modname,abort_message,1)
     76       CALL abort_physic(modname,abort_message,1)
    7777    ENDIF
    7878    run_off_ter(:) = 0.
     
    8181    IF (error /= 0) THEN
    8282       abort_message='Pb allocation run_off_lic'
    83        CALL abort_gcm(modname,abort_message,1)
     83       CALL abort_physic(modname,abort_message,1)
    8484    ENDIF
    8585    run_off_lic(:) = 0.
     
    8888    IF (error /= 0) THEN
    8989       abort_message='Pb allocation ffonte_global'
    90        CALL abort_gcm(modname,abort_message,1)
     90       CALL abort_physic(modname,abort_message,1)
    9191    ENDIF
    9292    ffonte_global(:,:) = 0.0
     
    9595    IF (error /= 0) THEN
    9696       abort_message='Pb allocation fqfonte_global'
    97        CALL abort_gcm(modname,abort_message,1)
     97       CALL abort_physic(modname,abort_message,1)
    9898    ENDIF
    9999    fqfonte_global(:,:) = 0.0
     
    102102    IF (error /= 0) THEN
    103103       abort_message='Pb allocation fqcalving_global'
    104        CALL abort_gcm(modname,abort_message,1)
     104       CALL abort_physic(modname,abort_message,1)
    105105    ENDIF
    106106    fqcalving_global(:,:) = 0.0
     
    141141!   evap
    142142!
    143   INCLUDE "dimensions.h"
    144143  INCLUDE "YOETHF.h"
    145144  INCLUDE "YOMCST.h"
Note: See TracChangeset for help on using the changeset viewer.