Changeset 6773


Ignore:
Timestamp:
2016-07-01T18:59:05+02:00 (4 years ago)
Author:
kuniko
Message:

Recommented out lines for FA test and added "&" at end of continuation line 125

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_flux_adjust/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx_adj.F90

    r6716 r6773  
    3333   !ky 11/12/2015 recommented below two lines 
    3434   !!ky 3/12/2015 uncommented below two lines for FA test! 
     35   !!ky 20/06/2016 uncommented lower line of below two lines for FA test! 
     36   !!ky 01/07/2016 recommented lower line of below two lines 
    3537   !REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   erp   !: evaporation damping   [kg/m2/s] 
    3638   !REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   qrp   !: heat flux damping        [w/m2] 
     
    100102                     !ky 11/12/2015 commented out 1 line below 
    101103                     !!ky 3/12/2015 1 line below for FA test! 
     104                     !!ky 20/06/2016 uncommented 1 line below for FA test! 
     105                     !!ky 01/07/2016 recommented 1 line below 
    102106                     !qrp(ji,jj) = sf_qrp(1)%fnow(ji,jj,1) 
    103107                     qns(ji,jj) = qns(ji,jj) + zqrp 
     
    106110               !ky 11/12/2015 recommented out below 1 line below 
    107111               !!ky 3/12/2015 uncommented below 1 line below for FA test! 
     112               !!ky 20/06/2016 uncommented 1 line below for FA test! 
     113               !!ky 01/06/2016 recommented 1 line below  
    108114               !CALL iom_put( "qrp", qrp )                             ! heat flux damping 
    109115            ENDIF 
     
    117123                  DO ji = 1, jpi 
    118124                     zerp = ( 1. - 2.*rnfmsk(ji,jj) )  &              ! No damping in vicinity of river mouths 
    119                         &        * sf_erp(1)%fnow(ji,jj,1) 
     125                        &        * sf_erp(1)%fnow(ji,jj,1)  & 
    120126                        &        * MAX( sss_m(ji,jj), 1.e-20 )! reconverted into salinity flux 
    121127                     !ky 16/06/2016 restored above line (multiplication by MAX...) 
     
    210216      !ALLOCATE( qrp(jpi,jpj), erp(jpi,jpj), STAT=ierror ) 
    211217      !IF( ierror > 0 )   CALL ctl_stop( 'STOP', 'sbc_ssr: unable to allocate erp and qrp array' ) 
     218      !!ky 20/06/2016 uncommented below two lines for FA test! 
     219      !!ky 01/07/2016 recommented below two lines 
     220      !ALLOCATE( qrp(jpi,jpj), STAT=ierror ) 
     221      !IF( ierror > 0 )   CALL ctl_stop( 'STOP', 'sbcflx_adj: unable to allocate qrp array' ) 
    212222      ! 
    213223      IF( nn_flxadjht == 1 ) THEN      !* set sf_qrp structure & allocate arrays 
     
    242252      !ky 11/12/2015 commented out below two lines 
    243253      !!ky 3/12/2015 below two lines for FA test! 
     254      !!ky 20/06/2016 uncommented below line for FA test! 
     255      !!ky 01/07/2016 recommented below line 
    244256      !IF( nn_flxadjht /= 1                   )   qrp(:,:) = 0._wp 
    245257      !IF( nn_flxadjfw /= 1 .OR. nn_flxadjfw /= 2 )   erp(:,:) = 0._wp 
Note: See TracChangeset for help on using the changeset viewer.