Changeset 8848 for branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

Timestamp:

2017-11-29T17:01:42+01:00 (6 years ago)

Author:

jamrae

Message:

Renamed variable fmdice as rough_ice_fmd. Deleted some temporary write statements.

File:

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

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

@@ -149 +149 @@
    INTEGER, PARAMETER ::   jps_bio_dms = 35           ! MEDUSA DMS surface concentration
    INTEGER, PARAMETER ::   jps_bio_chloro = 36        ! MEDUSA chlorophyll surface concentration
-   INTEGER, PARAMETER ::   jps_fmdice = 37            ! ice form drag
+   INTEGER, PARAMETER ::   jps_rough_ice_fmd = 37     ! ice form drag roughness length
    INTEGER, PARAMETER ::   jps_rough_ice_skin = 38    ! ice skin roughness length
    INTEGER, PARAMETER ::   jpsnd      = 38            ! total number of fields sent
@@ -875 +875 @@
       !                                                      !   Sea ice form drag       !
       !                                                      ! ------------------------- !
-      ssnd(jps_fmdice )%clname = 'OIceFmd'
+      ssnd(jps_rough_ice_fmd )%clname = 'OIceFmd'
       ssnd(jps_rough_ice_skin )%clname = 'ORghIcSk'
       SELECT CASE ( TRIM( sn_snd_icerough%cldes ) )
          CASE ( 'none' )
-            ssnd(jps_fmdice)%laction = .FALSE.
+            ssnd(jps_rough_ice_fmd)%laction = .FALSE.
             ssnd(jps_rough_ice_skin)%laction = .FALSE.
          CASE ( 'ice', 'weighted ice' ) 
-            ssnd(jps_fmdice)%laction = .TRUE.
+            ssnd(jps_rough_ice_fmd)%laction = .TRUE.
             ssnd(jps_rough_ice_skin)%laction = .TRUE.
          CASE default   ;   CALL ctl_stop( 'sbc_cpl_init: wrong definition of sn_snd_icerough%cldes' )
@@ -2643 +2643 @@
       !                                                      ! ------------------------- !
 #if defined key_cice
-      IF( ssnd(jps_fmdice)%laction ) THEN
+      IF( ssnd(jps_rough_ice_fmd)%laction ) THEN
           SELECT CASE( sn_snd_icerough%cldes )
              CASE( 'ice' )
-                ztmp1(:,:) = fmdice(:,:)
+                ztmp1(:,:) = rough_ice_fmd(:,:)
              CASE( 'weighted ice' ) 
-                ztmp1(:,:) = fmdice(:,:) * fr_i(:,:)
+                ztmp1(:,:) = rough_ice_fmd(:,:) * fr_i(:,:)
              CASE default      ;  CALL ctl_stop( 'sbc_cpl_snd: wrong definition of sn_snd_icerough%cldes' )
           END SELECT
       ENDIF
-      IF( ssnd(jps_fmdice)%laction )   CALL cpl_snd( jps_fmdice, isec, RESHAPE ( ztmp1, (/jpi,jpj,1/) ), info ) 
+      IF( ssnd(jps_rough_ice_fmd)%laction )   CALL cpl_snd( jps_rough_ice_fmd, isec, RESHAPE ( ztmp1, (/jpi,jpj,1/) ), info ) 
 
       IF( ssnd(jps_rough_ice_skin)%laction ) THEN