Changeset 6773

Timestamp:

2016-07-01T18:59:05+02:00 (8 years ago)

Author:

kuniko

Message:

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

File:

• branches/UKMO/dev_r5518_flux_adjust/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx_adj.F90 (modified) (6 diffs)

branches/UKMO/dev_r5518_flux_adjust/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx_adj.F90

@@ -33 +33 @@
    !ky 11/12/2015 recommented below two lines
    !!ky 3/12/2015 uncommented below two lines for FA test!
+   !!ky 20/06/2016 uncommented lower line of below two lines for FA test!
+   !!ky 01/07/2016 recommented lower line of below two lines
    !REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   erp   !: evaporation damping   [kg/m2/s]
    !REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   qrp   !: heat flux damping        [w/m2]
@@ -100 +102 @@
                      !ky 11/12/2015 commented out 1 line below
                      !!ky 3/12/2015 1 line below for FA test!
+                     !!ky 20/06/2016 uncommented 1 line below for FA test!
+                     !!ky 01/07/2016 recommented 1 line below
                      !qrp(ji,jj) = sf_qrp(1)%fnow(ji,jj,1)
                      qns(ji,jj) = qns(ji,jj) + zqrp
@@ -106 +110 @@
                !ky 11/12/2015 recommented out below 1 line below
                !!ky 3/12/2015 uncommented below 1 line below for FA test!
+               !!ky 20/06/2016 uncommented 1 line below for FA test!
+               !!ky 01/06/2016 recommented 1 line below 
                !CALL iom_put( "qrp", qrp )                             ! heat flux damping
             ENDIF
@@ -117 +123 @@
                   DO ji = 1, jpi
                      zerp = ( 1. - 2.*rnfmsk(ji,jj) )  &              ! No damping in vicinity of river mouths
-                        &        * sf_erp(1)%fnow(ji,jj,1)
+                        &        * sf_erp(1)%fnow(ji,jj,1)  &
                         &        * MAX( sss_m(ji,jj), 1.e-20 )! reconverted into salinity flux
                      !ky 16/06/2016 restored above line (multiplication by MAX...)
@@ -210 +216 @@
       !ALLOCATE( qrp(jpi,jpj), erp(jpi,jpj), STAT=ierror )
       !IF( ierror > 0 )   CALL ctl_stop( 'STOP', 'sbc_ssr: unable to allocate erp and qrp array' )
+      !!ky 20/06/2016 uncommented below two lines for FA test!
+      !!ky 01/07/2016 recommented below two lines
+      !ALLOCATE( qrp(jpi,jpj), STAT=ierror )
+      !IF( ierror > 0 )   CALL ctl_stop( 'STOP', 'sbcflx_adj: unable to allocate qrp array' )
       !
       IF( nn_flxadjht == 1 ) THEN      !* set sf_qrp structure & allocate arrays
@@ -242 +252 @@
       !ky 11/12/2015 commented out below two lines
       !!ky 3/12/2015 below two lines for FA test!
+      !!ky 20/06/2016 uncommented below line for FA test!
+      !!ky 01/07/2016 recommented below line
       !IF( nn_flxadjht /= 1                   )   qrp(:,:) = 0._wp
       !IF( nn_flxadjfw /= 1 .OR. nn_flxadjfw /= 2 )   erp(:,:) = 0._wp