Changeset 2816


Ignore:
Timestamp:
2011-07-29T10:31:06+02:00 (10 years ago)
Author:
charris
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2011/dev_r2802_UKMO8_sbccpl/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

    r2813 r2816  
    522522      !                                                      ! ------------------------- ! 
    523523      ssnd(jps_fice)%clname = 'OIceFrc' 
     524      ssnd(jps_hice)%clname = 'OIceTck' 
    524525      ssnd(jps_hsnw)%clname = 'OSnwTck' 
    525       ssnd(jps_hice)%clname = 'OIceTck' 
    526526      IF( k_ice /= 0 ) THEN 
    527527         ssnd(jps_fice)%laction = .TRUE.                  ! if ice treated in the ocean (even in climato case) 
     
    532532      SELECT CASE ( TRIM( sn_snd_thick%cldes ) ) 
    533533      CASE ( 'ice and snow' )  
    534          ssnd(jps_hsnw:jps_hice)%laction = .TRUE. 
    535          ssnd(jps_hsnw:jps_hice)%nct = jpl 
     534         ssnd(jps_hice:jps_hsnw)%laction = .TRUE. 
     535         ssnd(jps_hice:jps_hsnw)%nct = jpl 
    536536      CASE ( 'weighted ice and snow' )  
    537          ssnd(jps_hsnw:jps_hice)%laction = .TRUE. 
    538          IF ( TRIM( sn_snd_thick%clcat ) == 'yes' ) ssnd(jps_hsnw:jps_hice)%nct = jpl 
     537         ssnd(jps_hice:jps_hsnw)%laction = .TRUE. 
     538         IF ( TRIM( sn_snd_thick%clcat ) == 'yes' ) ssnd(jps_hice:jps_hsnw)%nct = jpl 
    539539      CASE default   ;   CALL ctl_stop( 'sbc_cpl_init: wrong definition of sn_snd_thick%cldes' ) 
    540540      END SELECT 
     
    13331333      IF( ssnd(jps_fice)%laction ) CALL cpl_prism_snd( jps_fice, isec, ztmp3, info ) 
    13341334 
    1335       ! Send snow and ice thickness field  
     1335      ! Send ice and snow thickness field  
    13361336      SELECT CASE( sn_snd_thick%cldes) 
    13371337      CASE( 'weighted ice and snow' )    
    13381338         SELECT CASE( sn_snd_thick%clcat ) 
    13391339         CASE( 'yes' )    
    1340             ztmp3(:,:,1:jpl) =  ht_s(:,:,1:jpl) * a_i(:,:,1:jpl) 
    1341             ztmp4(:,:,1:jpl) =  ht_i(:,:,1:jpl) * a_i(:,:,1:jpl) 
     1340            ztmp3(:,:,1:jpl) =  ht_i(:,:,1:jpl) * a_i(:,:,1:jpl) 
     1341            ztmp4(:,:,1:jpl) =  ht_s(:,:,1:jpl) * a_i(:,:,1:jpl) 
    13421342         CASE( 'no' ) 
    13431343            ztmp3(:,:,:) = 0.0   ;  ztmp4(:,:,:) = 0.0 
    13441344            DO jl=1,jpl 
    1345                ztmp3(:,:,1) = ztmp3(:,:,1) + ht_s(:,:,jl) * a_i(:,:,jl) 
    1346                ztmp4(:,:,1) = ztmp4(:,:,1) + ht_i(:,:,jl) * a_i(:,:,jl) 
     1345               ztmp3(:,:,1) = ztmp3(:,:,1) + ht_i(:,:,jl) * a_i(:,:,jl) 
     1346               ztmp4(:,:,1) = ztmp4(:,:,1) + ht_s(:,:,jl) * a_i(:,:,jl) 
    13471347            ENDDO 
    13481348         CASE default                  ;   CALL ctl_stop( 'sbc_cpl_snd: wrong definition of sn_snd_thick%clcat' ) 
    13491349         END SELECT 
    13501350      CASE( 'ice and snow'         )    
    1351          ztmp3(:,:,1:jpl) = ht_s(:,:,1:jpl) 
    1352          ztmp4(:,:,1:jpl) = ht_i(:,:,1:jpl) 
     1351         ztmp3(:,:,1:jpl) = ht_i(:,:,1:jpl) 
     1352         ztmp4(:,:,1:jpl) = ht_s(:,:,1:jpl) 
    13531353      CASE default                     ;   CALL ctl_stop( 'sbc_cpl_snd: wrong definition of sn_snd_thick%cldes' ) 
    13541354      END SELECT 
    1355       IF( ssnd(jps_hsnw)%laction )   CALL cpl_prism_snd( jps_hsnw, isec, ztmp3, info ) 
    1356       IF( ssnd(jps_hice)%laction )   CALL cpl_prism_snd( jps_hice, isec, ztmp4, info ) 
     1355      IF( ssnd(jps_hice)%laction )   CALL cpl_prism_snd( jps_hice, isec, ztmp3, info ) 
     1356      IF( ssnd(jps_hsnw)%laction )   CALL cpl_prism_snd( jps_hsnw, isec, ztmp4, info ) 
    13571357      ! 
    13581358#if defined key_cpl_carbon_cycle 
Note: See TracChangeset for help on using the changeset viewer.