Changeset 6700


Ignore:
Timestamp:
2016-06-13T17:21:13+02:00 (4 years ago)
Author:
frrh
Message:

Merge in fix to allow compkilation without CICE being present.
This is the merge of UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bitcomp
revision 6651

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_GO6_package_MEDUSA_temporary/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

    r6698 r6700  
    773773      END SELECT 
    774774#else 
    775       IF( TRIM( sn_snd_mpnd%cldes /= 'none' ) THEN 
     775      IF( TRIM( sn_snd_mpnd%cldes ) /= 'none' ) THEN 
    776776         CALL ctl_stop('Meltponds can only be used with CICEv5') 
    777777      ENDIF 
     
    22512251      ENDIF 
    22522252      ! 
     2253#if defined key_cice && ! defined key_cice4 
    22532254      ! Send meltpond fields  
    22542255      IF( ssnd(jps_a_p)%laction .OR. ssnd(jps_ht_p)%laction ) THEN 
     
    22932294         IF( ssnd(jps_kice)%laction )   CALL cpl_snd( jps_kice, isec, ztmp3, info ) 
    22942295      ENDIF 
     2296#endif 
    22952297      ! 
    22962298      ! 
     
    24902492      IF( ssnd(jps_taum  )%laction )  CALL cpl_snd( jps_taum  , isec, RESHAPE ( taum, (/jpi,jpj,1/) ), info ) 
    24912493       
     2494#if defined key_cice 
    24922495      ztmp1(:,:) = sstfrz(:,:) + rt0 
    24932496      IF( ssnd(jps_sstfrz)%laction )  CALL cpl_snd( jps_sstfrz, isec, RESHAPE ( ztmp1, (/jpi,jpj,1/) ), info ) 
     2497#endif 
    24942498      ! 
    24952499      CALL wrk_dealloc( jpi,jpj, zfr_l, ztmp1, ztmp2, zotx1, zoty1, zotz1, zitx1, zity1, zitz1 ) 
Note: See TracChangeset for help on using the changeset viewer.