Changeset 8448

Timestamp:

2017-08-21T15:06:27+02:00 (7 years ago)

Author:

jamrae

Message:

Changes to NEMO coupling for form drag field.

File:

• branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) (2 diffs)

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

@@ -616 +616 @@
       !                                                      ! ------------------------- !
       ssnd(jps_fmdice )%clname = 'OIceFmd'
-      ssnd(jps_fmdice)%laction = .FALSE.
-      IF( TRIM( sn_snd_fmd%cldes ) == 'coupled' ) ssnd(jps_fmdice)%laction = .TRUE.      
+      SELECT CASE ( TRIM( sn_snd_fmd%cldes ) )
+         CASE ( 'none' )
+            ssnd(jps_fmdice)%laction = .FALSE.
+         CASE ( 'coupled' ) 
+            ssnd(jps_fmdice)%laction = .TRUE.
+         CASE default   ;   CALL ctl_stop( 'sbc_cpl_init: wrong definition of sn_snd_fmd%cldes' )
+      END SELECT
       !                                                      ! -------------------------------- !
       !                                                      !   OPA-SAS coupling - rcv by sas  !   
@@ -2627 +2632 @@
       ztmp1(:,:) = sstfrz(:,:) + rt0
       IF( ssnd(jps_sstfrz)%laction )  CALL cpl_snd( jps_sstfrz, isec, RESHAPE ( ztmp1, (/jpi,jpj,1/) ), info )
-      SELECT CASE( sn_snd_fmd%cldes)
-         CASE( 'coupled' )   
-             ztmp1(:,:) = fmdice(:,:)
-      END SELECT
+      ztmp1(:,:) = fmdice(:,:)
       IF( ssnd(jps_fmdice)%laction )   CALL cpl_snd( jps_fmdice, isec, RESHAPE ( ztmp1, (/jpi,jpj,1/) ), info ) 
 #endif