Changeset 8848


Ignore:
Timestamp:
2017-11-29T17:01:42+01:00 (3 years ago)
Author:
jamrae
Message:

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

Location:
branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

    r8458 r8848  
    216216      ! 
    217217      DO ji = 1, ksnd 
    218          WRITE(numout,*) '==========================================================' 
    219          WRITE(numout,*) 'In cpl_define' 
    220          WRITE(numout,*) 'ji: ', ji 
    221          WRITE(numout,*) 'ssnd(ji)%laction: ', ssnd(ji)%laction 
    222          WRITE(numout,*) 'ssnd(ji)%nct: ', ssnd(ji)%nct 
    223          WRITE(numout,*) 'ssnd(ji)%clname: ', ssnd(ji)%clname 
    224          WRITE(numout,*) '==========================================================' 
    225218         IF ( ssnd(ji)%laction ) THEN 
    226219 
  • branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90

    r8819 r8848  
    116116   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::  a_i 
    117117   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::  ht_i, ht_s 
    118    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::  fmdice, rough_ice_skin 
     118   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::  rough_ice_fmd, rough_ice_skin 
    119119#endif 
    120120 
     
    176176#if defined key_cice || defined key_lim2 
    177177      IF( ln_cpl )   ALLOCATE( ht_i(jpi,jpj,jpl) , ht_s(jpi,jpj,jpl) , STAT=ierr(5) ) 
    178       IF( ln_cpl )   ALLOCATE( fmdice(jpi,jpj) , rough_ice_skin(jpi,jpj) , STAT=ierr(5) )  
     178      IF( ln_cpl )   ALLOCATE( rough_ice_fmd(jpi,jpj) , rough_ice_skin(jpi,jpj) , STAT=ierr(5) )  
    179179#endif 
    180180 
  • branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

    r8819 r8848  
    149149   INTEGER, PARAMETER ::   jps_bio_dms = 35           ! MEDUSA DMS surface concentration 
    150150   INTEGER, PARAMETER ::   jps_bio_chloro = 36        ! MEDUSA chlorophyll surface concentration 
    151    INTEGER, PARAMETER ::   jps_fmdice = 37            ! ice form drag 
     151   INTEGER, PARAMETER ::   jps_rough_ice_fmd = 37     ! ice form drag roughness length 
    152152   INTEGER, PARAMETER ::   jps_rough_ice_skin = 38    ! ice skin roughness length 
    153153   INTEGER, PARAMETER ::   jpsnd      = 38            ! total number of fields sent 
     
    875875      !                                                      !   Sea ice form drag       ! 
    876876      !                                                      ! ------------------------- ! 
    877       ssnd(jps_fmdice )%clname = 'OIceFmd' 
     877      ssnd(jps_rough_ice_fmd )%clname = 'OIceFmd' 
    878878      ssnd(jps_rough_ice_skin )%clname = 'ORghIcSk' 
    879879      SELECT CASE ( TRIM( sn_snd_icerough%cldes ) ) 
    880880         CASE ( 'none' ) 
    881             ssnd(jps_fmdice)%laction = .FALSE. 
     881            ssnd(jps_rough_ice_fmd)%laction = .FALSE. 
    882882            ssnd(jps_rough_ice_skin)%laction = .FALSE. 
    883883         CASE ( 'ice', 'weighted ice' )  
    884             ssnd(jps_fmdice)%laction = .TRUE. 
     884            ssnd(jps_rough_ice_fmd)%laction = .TRUE. 
    885885            ssnd(jps_rough_ice_skin)%laction = .TRUE. 
    886886         CASE default   ;   CALL ctl_stop( 'sbc_cpl_init: wrong definition of sn_snd_icerough%cldes' ) 
     
    26432643      !                                                      ! ------------------------- ! 
    26442644#if defined key_cice 
    2645       IF( ssnd(jps_fmdice)%laction ) THEN 
     2645      IF( ssnd(jps_rough_ice_fmd)%laction ) THEN 
    26462646          SELECT CASE( sn_snd_icerough%cldes ) 
    26472647             CASE( 'ice' ) 
    2648                 ztmp1(:,:) = fmdice(:,:) 
     2648                ztmp1(:,:) = rough_ice_fmd(:,:) 
    26492649             CASE( 'weighted ice' )  
    2650                 ztmp1(:,:) = fmdice(:,:) * fr_i(:,:) 
     2650                ztmp1(:,:) = rough_ice_fmd(:,:) * fr_i(:,:) 
    26512651             CASE default      ;  CALL ctl_stop( 'sbc_cpl_snd: wrong definition of sn_snd_icerough%cldes' ) 
    26522652          END SELECT 
    26532653      ENDIF 
    2654       IF( ssnd(jps_fmdice)%laction )   CALL cpl_snd( jps_fmdice, isec, RESHAPE ( ztmp1, (/jpi,jpj,1/) ), info )  
     2654      IF( ssnd(jps_rough_ice_fmd)%laction )   CALL cpl_snd( jps_rough_ice_fmd, isec, RESHAPE ( ztmp1, (/jpi,jpj,1/) ), info )  
    26552655 
    26562656      IF( ssnd(jps_rough_ice_skin)%laction ) THEN 
  • branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

    r8819 r8848  
    259259      ENDIF 
    260260 
    261       CALL cice2nemo(z0atm,fmdice,'T', 1. ) 
     261      CALL cice2nemo(z0atm,rough_ice_fmd,'T', 1. ) 
    262262      CALL cice2nemo(z0atmskin,rough_ice_skin,'T', 1. ) 
    263263 
     
    312312      IF( nn_timing == 1 )  CALL timing_stop('cice_sbc_init') 
    313313      ! 
    314  
    315  
    316       IF(lwp) THEN                        ! control print 
    317         WRITE(numout,*) 
    318         WRITE(numout,*)'=============================================================' 
    319         WRITE(numout,*)'At end of subroutine cice_sbc_init' 
    320         WRITE(numout,*)'MAXVAL(z0atm): ', MAXVAL(z0atm) 
    321         WRITE(numout,*)'MAXLOC(z0atm): ', MAXLOC(z0atm) 
    322         WRITE(numout,*)'MINVAL(z0atm): ', MINVAL(z0atm) 
    323         WRITE(numout,*)'MINLOC(z0atm): ', MINLOC(z0atm) 
    324         WRITE(numout,*)'MAXVAL(z0atmskin): ', MAXVAL(z0atmskin) 
    325         WRITE(numout,*)'MAXLOC(z0atmskin): ', MAXLOC(z0atmskin) 
    326         WRITE(numout,*)'MINVAL(z0atmskin): ', MINVAL(z0atmskin) 
    327         WRITE(numout,*)'MINLOC(z0atmskin): ', MINLOC(z0atmskin) 
    328         WRITE(numout,*)'=============================================================' 
    329         WRITE(numout,*) 
    330       ENDIF 
    331  
    332  
    333  
    334314   END SUBROUTINE cice_sbc_init 
    335315 
     
    810790 
    811791! Surface roughness length for form drag 
    812       CALL cice2nemo(z0atm,fmdice,'T', 1. ) 
     792      CALL cice2nemo(z0atm,rough_ice_fmd,'T', 1. ) 
    813793 
    814794! Surface skin roughness length 
  • branches/UKMO/dev_r5518_GO6_package_r8356_plus_form_drag/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

    r8819 r8848  
    306306      ! 
    307307      IF( nn_ice == 3      )   CALL sbc_lim_init               ! LIM3 initialisation 
     308 
    308309      IF( nn_ice == 4      )   CALL cice_sbc_init( nsbc )      ! CICE initialisation 
    309310 
Note: See TracChangeset for help on using the changeset viewer.