Changeset 7217 for branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90

Timestamp:

2016-11-09T21:27:33+01:00 (7 years ago)

Author:

cbricaud

Message:

CRS branch: code cleaning

File:

• branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90 (modified) (5 diffs)

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90

@@ -34 +34 @@
    USE zpshde          ! partial step: hor. derivative       (zps_hde routine)
    USE zpshde_crs      ! partial step: hor. derivative       (zps_hde routine)
-   USE dom_oce , ONLY : ln_crs, ln_isfcav
+   USE dom_oce , ONLY : ln_isfcav
    USE crs     , ONLY : jpi_crs,jpj_crs,wn_crs,ln_crs_top,sbc_trc_crs,sbc_trc_b_crs
    USE ldfslp_crs
@@ -76 +76 @@
       IF( .NOT. lk_c1d ) THEN
          !
-         CALL test(kstp,1)
                                CALL trc_sbc( kstp )
-         CALL test(kstp,2)
          IF( ln_crs_top ) THEN ;    CALL trc_bbl_crs( kstp )
          ELSE              ;    CALL trc_bbl( kstp )
@@ -84 +82 @@
          IF( ln_trcdmp )        CALL trc_dmp( kstp )            ! internal damping trends
 
-         CALL test(kstp,3)
          IF( ln_crs_top ) THEN ;    CALL trc_adv_crs( kstp )
          ELSE              ;    CALL trc_adv( kstp )
          ENDIF
 
-         CALL test(kstp,4)
          IF( ln_trcdmp_clo )    CALL trc_dmp_clo( kstp )        ! internal damping trends on closed seas only
          IF( ln_crs_top ) THEN ;    CALL trc_ldf_crs( kstp )
          ELSE              ;    CALL trc_ldf( kstp )
          ENDIF
-         CALL test(kstp,5)
          IF( .NOT. lk_offline .AND. lk_zdfkpp )    &
             &                   CALL trc_kpp( kstp )            ! KPP non-local tracer fluxes
@@ -103 +98 @@
          ELSE              ;    CALL trc_zdf( kstp )
          ENDIF
-         CALL test(kstp,6)
 
                                 CALL trc_nxt( kstp )            ! tracer fields at next time step     
-         CALL test(kstp,10)
          IF( ln_trcrad )        CALL trc_rad( kstp )            ! Correct artificial negative concentrations
 
@@ -140 +133 @@
    END SUBROUTINE trc_trp
 
-   SUBROUTINE test(kt,i)
-   INTEGER,INTENT(IN) :: kt,i
-   REAL(wp)::zmin,zmax
-   INTEGER :: ji,jj,jk
-   zmin=MINVAL( trb(2:jpi-1,2:jpj-1,:,1),mask=(tmask(2:jpi-1,2:jpj-1,:)==1)) ; CALL mpp_min(zmin)
-   zmax=MAXVAL( trb(2:jpi-1,2:jpj-1,:,1),mask=(tmask(2:jpi-1,2:jpj-1,:)==1)) ; CALL mpp_max(zmax)
-   IF(lwp)WRITE(numout,*)"trctrp b ",kt,i,zmin,zmax   
-   zmin=MINVAL( trn(2:jpi-1,2:jpj-1,:,1),mask=(tmask(2:jpi-1,2:jpj-1,:)==1)) ; CALL mpp_min(zmin)
-   zmax=MAXVAL( trn(2:jpi-1,2:jpj-1,:,1),mask=(tmask(2:jpi-1,2:jpj-1,:)==1)) ; CALL mpp_max(zmax)
-   IF(lwp)WRITE(numout,*)"trctrp n ",kt,i,zmin,zmax   
-   zmin=MINVAL( tra(2:jpi-1,2:jpj-1,:,1),mask=(tmask(2:jpi-1,2:jpj-1,:)==1)) ; CALL mpp_min(zmin)
-   zmax=MAXVAL( tra(2:jpi-1,2:jpj-1,:,1),mask=(tmask(2:jpi-1,2:jpj-1,:)==1)) ; CALL mpp_max(zmax)
-   IF(lwp)WRITE(numout,*)"trctrp a ",kt,i,zmin,zmax   
-
-   DO ji=1,jpi
-   DO jj=1,jpj
-   DO jk=1,jpk
-   IF( ieee_is_nan(tra(ji,jj,jk,1)))WRITE(narea+200,*)"test nan a",kt,i,ji,jj,jk,tmask(ji,jj,jk)
-   IF( ieee_is_nan(trn(ji,jj,jk,1)))WRITE(narea+200,*)"test nan n",kt,i,ji,jj,jk,tmask(ji,jj,jk)
-   IF( ieee_is_nan(trb(ji,jj,jk,1)))WRITE(narea+200,*)"test nan b",kt,i,ji,jj,jk,tmask(ji,jj,jk)
-   ENDDO
-   ENDDO
-   ENDDO
-
-   END SUBROUTINE test
 #else
    !!----------------------------------------------------------------------