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/change_srf_frac_mod.F90

    r2298 r2408  
    3333    USE ocean_slab_mod, ONLY : fsic, ocean_slab_frac
    3434    USE indice_sol_mod
    35 
    36     INCLUDE "iniprint.h"
     35    USE print_control_mod, ONLY: lunout
     36   
    3737    INCLUDE "YOMCST.h"
    3838!albedo SB >>>
     
    109109          WRITE(lunout,*)'at point = ',MINLOC(pctsrf(:,:))
    110110          WRITE(lunout,*)'value = ',MINVAL(pctsrf(:,:))
    111           CALL abort_gcm('change_srf_frac','Negative fraction',1)
     111          CALL abort_physic('change_srf_frac','Negative fraction',1)
    112112       END IF
    113113
     
    116116          DO i= 1, klon
    117117             tmpsum = SUM(pctsrf(i,:))
    118              IF (ABS(1. - tmpsum) > 0.05) CALL abort_gcm('change_srf_frac','Total fraction not equal 1.',1)
     118             IF (ABS(1. - tmpsum) > 0.05) CALL abort_physic('change_srf_frac','Total fraction not equal 1.',1)
    119119          END DO
    120120       END IF
Note: See TracChangeset for help on using the changeset viewer.