Changeset 6700

Timestamp:

2016-06-13T17:21:13+02:00 (8 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:

• branches/UKMO/dev_r5518_GO6_package_MEDUSA_temporary/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) (4 diffs)

branches/UKMO/dev_r5518_GO6_package_MEDUSA_temporary/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -773 +773 @@
       END SELECT
 #else
-      IF( TRIM( sn_snd_mpnd%cldes /= 'none' ) THEN
+      IF( TRIM( sn_snd_mpnd%cldes ) /= 'none' ) THEN
          CALL ctl_stop('Meltponds can only be used with CICEv5')
       ENDIF
@@ -2251 +2251 @@
       ENDIF
       !
+#if defined key_cice && ! defined key_cice4
       ! Send meltpond fields 
       IF( ssnd(jps_a_p)%laction .OR. ssnd(jps_ht_p)%laction ) THEN
@@ -2293 +2294 @@
          IF( ssnd(jps_kice)%laction )   CALL cpl_snd( jps_kice, isec, ztmp3, info )
       ENDIF
+#endif
       !
       !
@@ -2490 +2492 @@
       IF( ssnd(jps_taum  )%laction )  CALL cpl_snd( jps_taum  , isec, RESHAPE ( taum, (/jpi,jpj,1/) ), info )
       
+#if defined key_cice
       ztmp1(:,:) = sstfrz(:,:) + rt0
       IF( ssnd(jps_sstfrz)%laction )  CALL cpl_snd( jps_sstfrz, isec, RESHAPE ( ztmp1, (/jpi,jpj,1/) ), info )
+#endif
       !
       CALL wrk_dealloc( jpi,jpj, zfr_l, ztmp1, ztmp2, zotx1, zoty1, zotz1, zitx1, zity1, zitz1 )