Changeset 2816 for branches/2011/dev_r2802_UKMO8_sbccpl

Timestamp:

2011-07-29T10:31:06+02:00 (13 years ago)

Author:

charris

Message:

#662 Fix to ordering of ice and snow thickness fields.

File:

• branches/2011/dev_r2802_UKMO8_sbccpl/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) (3 diffs)

branches/2011/dev_r2802_UKMO8_sbccpl/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -522 +522 @@
       !                                                      ! ------------------------- !
       ssnd(jps_fice)%clname = 'OIceFrc'
+      ssnd(jps_hice)%clname = 'OIceTck'
       ssnd(jps_hsnw)%clname = 'OSnwTck'
-      ssnd(jps_hice)%clname = 'OIceTck'
       IF( k_ice /= 0 ) THEN
          ssnd(jps_fice)%laction = .TRUE.                  ! if ice treated in the ocean (even in climato case)
@@ -532 +532 @@
       SELECT CASE ( TRIM( sn_snd_thick%cldes ) )
       CASE ( 'ice and snow' ) 
-         ssnd(jps_hsnw:jps_hice)%laction = .TRUE.
-         ssnd(jps_hsnw:jps_hice)%nct = jpl
+         ssnd(jps_hice:jps_hsnw)%laction = .TRUE.
+         ssnd(jps_hice:jps_hsnw)%nct = jpl
       CASE ( 'weighted ice and snow' ) 
-         ssnd(jps_hsnw:jps_hice)%laction = .TRUE.
-         IF ( TRIM( sn_snd_thick%clcat ) == 'yes' ) ssnd(jps_hsnw:jps_hice)%nct = jpl
+         ssnd(jps_hice:jps_hsnw)%laction = .TRUE.
+         IF ( TRIM( sn_snd_thick%clcat ) == 'yes' ) ssnd(jps_hice:jps_hsnw)%nct = jpl
       CASE default   ;   CALL ctl_stop( 'sbc_cpl_init: wrong definition of sn_snd_thick%cldes' )
       END SELECT
@@ -1333 +1333 @@
       IF( ssnd(jps_fice)%laction ) CALL cpl_prism_snd( jps_fice, isec, ztmp3, info )
 
-      ! Send snow and ice thickness field 
+      ! Send ice and snow thickness field 
       SELECT CASE( sn_snd_thick%cldes)
       CASE( 'weighted ice and snow' )   
          SELECT CASE( sn_snd_thick%clcat )
          CASE( 'yes' )   
-            ztmp3(:,:,1:jpl) =  ht_s(:,:,1:jpl) * a_i(:,:,1:jpl)
-            ztmp4(:,:,1:jpl) =  ht_i(:,:,1:jpl) * a_i(:,:,1:jpl)
+            ztmp3(:,:,1:jpl) =  ht_i(:,:,1:jpl) * a_i(:,:,1:jpl)
+            ztmp4(:,:,1:jpl) =  ht_s(:,:,1:jpl) * a_i(:,:,1:jpl)
          CASE( 'no' )
             ztmp3(:,:,:) = 0.0   ;  ztmp4(:,:,:) = 0.0
             DO jl=1,jpl
-               ztmp3(:,:,1) = ztmp3(:,:,1) + ht_s(:,:,jl) * a_i(:,:,jl)
-               ztmp4(:,:,1) = ztmp4(:,:,1) + ht_i(:,:,jl) * a_i(:,:,jl)
+               ztmp3(:,:,1) = ztmp3(:,:,1) + ht_i(:,:,jl) * a_i(:,:,jl)
+               ztmp4(:,:,1) = ztmp4(:,:,1) + ht_s(:,:,jl) * a_i(:,:,jl)
             ENDDO
          CASE default                  ;   CALL ctl_stop( 'sbc_cpl_snd: wrong definition of sn_snd_thick%clcat' )
          END SELECT
       CASE( 'ice and snow'         )   
-         ztmp3(:,:,1:jpl) = ht_s(:,:,1:jpl)
-         ztmp4(:,:,1:jpl) = ht_i(:,:,1:jpl)
+         ztmp3(:,:,1:jpl) = ht_i(:,:,1:jpl)
+         ztmp4(:,:,1:jpl) = ht_s(:,:,1:jpl)
       CASE default                     ;   CALL ctl_stop( 'sbc_cpl_snd: wrong definition of sn_snd_thick%cldes' )
       END SELECT
-      IF( ssnd(jps_hsnw)%laction )   CALL cpl_prism_snd( jps_hsnw, isec, ztmp3, info )
-      IF( ssnd(jps_hice)%laction )   CALL cpl_prism_snd( jps_hice, isec, ztmp4, info )
+      IF( ssnd(jps_hice)%laction )   CALL cpl_prism_snd( jps_hice, isec, ztmp3, info )
+      IF( ssnd(jps_hsnw)%laction )   CALL cpl_prism_snd( jps_hsnw, isec, ztmp4, info )
       !
 #if defined key_cpl_carbon_cycle