Changeset 10166

Timestamp:

2018-10-03T11:25:38+02:00 (6 years ago)

Author:

smasson

Message:

dev_r10164_HPC09_ESIWACE_PREP_MERGE: action 1: add BENCh test case, see #2133

Location:

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/tests

Files:

• BENCH (copied) (copied from NEMO/branches/2018/dev_r9759_HPC09_ESIWACE/tests/BENCH)
• BENCH/MY_SRC/diawri.F90 (modified) (10 diffs)
• BENCH/MY_SRC/restart.F90 (deleted)
• BENCH/MY_SRC/usrdef_istate.F90 (modified) (1 diff)
• BENCH/MY_SRC/usrdef_zgr.F90 (modified) (1 diff)
• BENCH/MY_SRC/zdfiwm.F90 (modified) (1 diff)
• demo_cfgs.txt (modified) (1 diff)

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/tests/BENCH/MY_SRC/diawri.F90

@@ -125 +125 @@
       ! Output of initial vertical scale factor
       CALL iom_put("e3t_0", e3t_0(:,:,:) )
-      CALL iom_put("e3u_0", e3t_0(:,:,:) )
-      CALL iom_put("e3v_0", e3t_0(:,:,:) )
+      CALL iom_put("e3u_0", e3u_0(:,:,:) )
+      CALL iom_put("e3v_0", e3v_0(:,:,:) )
       !
       CALL iom_put( "e3t" , e3t_n(:,:,:) )
@@ -181 +181 @@
             END DO
          END DO
-         CALL lbc_lnk( "diawri",z2d, 'T', 1. )
+         CALL lbc_lnk( z2d, 'T', 1. )
          CALL iom_put( "taubot", z2d )           
       ENDIF
@@ -237 +237 @@
             END DO
          END DO
-         CALL lbc_lnk( "diawri",z2d, 'T', 1. )
+         CALL lbc_lnk( z2d, 'T', 1. )
          CALL iom_put( "sstgrad2",  z2d )          ! square of module of sst gradient
          z2d(:,:) = SQRT( z2d(:,:) )
@@ -281 +281 @@
             END DO
          END DO
-         CALL lbc_lnk( "diawri",z3d, 'T', 1. )
+         CALL lbc_lnk( z3d, 'T', 1. )
          CALL iom_put( "eken", z3d )                 ! kinetic energy
       ENDIF
@@ -307 +307 @@
             END DO
          END DO
-         CALL lbc_lnk( "diawri",z2d, 'U', -1. )
+         CALL lbc_lnk( z2d, 'U', -1. )
          CALL iom_put( "u_heattr", 0.5*rcp * z2d )    ! heat transport in i-direction
       ENDIF
@@ -320 +320 @@
             END DO
          END DO
-         CALL lbc_lnk( "diawri",z2d, 'U', -1. )
+         CALL lbc_lnk( z2d, 'U', -1. )
          CALL iom_put( "u_salttr", 0.5 * z2d )        ! heat transport in i-direction
       ENDIF
@@ -342 +342 @@
             END DO
          END DO
-         CALL lbc_lnk( "diawri",z2d, 'V', -1. )
+         CALL lbc_lnk( z2d, 'V', -1. )
          CALL iom_put( "v_heattr", 0.5*rcp * z2d )    !  heat transport in j-direction
       ENDIF
@@ -355 +355 @@
             END DO
          END DO
-         CALL lbc_lnk( "diawri",z2d, 'V', -1. )
+         CALL lbc_lnk( z2d, 'V', -1. )
          CALL iom_put( "v_salttr", 0.5 * z2d )        !  heat transport in j-direction
       ENDIF
@@ -368 +368 @@
             END DO
          END DO
-         CALL lbc_lnk( "diawri",z2d, 'T', -1. )
+         CALL lbc_lnk( z2d, 'T', -1. )
          CALL iom_put( "tosmint", rau0 * z2d )        ! Vertical integral of temperature
       ENDIF
@@ -380 +380 @@
             END DO
          END DO
-         CALL lbc_lnk( "diawri",z2d, 'T', -1. )
+         CALL lbc_lnk( z2d, 'T', -1. )
          CALL iom_put( "somint", rau0 * z2d )         ! Vertical integral of salinity
       ENDIF

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/tests/BENCH/MY_SRC/usrdef_istate.F90

@@ -80 +80 @@
       ENDDO
       !
-      CALL lbc_lnk("usr_def_istate", pssh, 'T',  1. )            ! apply boundary conditions
-      CALL lbc_lnk("usr_def_istate",  pts, 'T',  1. )            ! apply boundary conditions
-      CALL lbc_lnk("usr_def_istate",   pu, 'U', -1. )            ! apply boundary conditions
-      CALL lbc_lnk("usr_def_istate",   pv, 'V', -1. )            ! apply boundary conditions
+      CALL lbc_lnk(pssh, 'T',  1. )            ! apply boundary conditions
+      CALL lbc_lnk( pts, 'T',  1. )            ! apply boundary conditions
+      CALL lbc_lnk(  pu, 'U', -1. )            ! apply boundary conditions
+      CALL lbc_lnk(  pv, 'V', -1. )            ! apply boundary conditions
       
    END SUBROUTINE usr_def_istate

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/tests/BENCH/MY_SRC/usrdef_zgr.F90

@@ -194 +194 @@
       z2d(:,:) = REAL( jpkm1 , wp )          ! flat bottom
       !
-      CALL lbc_lnk( "usrdef_zgr", z2d, 'T', 1. )           ! set surrounding land to zero (here jperio=0 ==>> closed)
+      CALL lbc_lnk( z2d, 'T', 1. )           ! set surrounding land to zero (here jperio=0 ==>> closed)
       !
       k_bot(:,:) = INT( z2d(:,:) )           ! =jpkm1 over the ocean point, =0 elsewhere

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/tests/BENCH/MY_SRC/zdfiwm.F90

@@ -442 +442 @@
 !!$      CALL iom_get  (inum, jpdom_data, 'field', ebot_iwm, 1 ) 
 !!$      CALL iom_close(inum)
-      ebot_iwm(:,:) = 0.
+      ebot_iwm(:,:) = 1.e-6
       !
 !!$      CALL iom_open('mixing_power_pyc',inum)       ! energy flux for pynocline-intensified wave breaking [W/m2]
 !!$      CALL iom_get  (inum, jpdom_data, 'field', epyc_iwm, 1 )
 !!$      CALL iom_close(inum)
-      epyc_iwm(:,:) = 0.
+      epyc_iwm(:,:) = 1.e-6
       !
 !!$      CALL iom_open('mixing_power_cri',inum)       ! energy flux for critical slope wave breaking [W/m2]
 !!$      CALL iom_get  (inum, jpdom_data, 'field', ecri_iwm, 1 )
 !!$      CALL iom_close(inum)
-      ecri_iwm(:,:) = 0.
+      ecri_iwm(:,:) = 1.e-10
       !
 !!$      CALL iom_open('decay_scale_bot',inum)        ! spatially variable decay scale for high-mode wave breaking [m]
 !!$      CALL iom_get  (inum, jpdom_data, 'field', hbot_iwm, 1 )
 !!$      CALL iom_close(inum)
-      hbot_iwm(:,:) = 1.
+      hbot_iwm(:,:) = 100.
       !
 !!$      CALL iom_open('decay_scale_cri',inum)        ! spatially variable decay scale for critical slope wave breaking [m]
 !!$      CALL iom_get  (inum, jpdom_data, 'field', hcri_iwm, 1 )
 !!$      CALL iom_close(inum)
-      hcri_iwm(:,:) = 1.
+      hcri_iwm(:,:) = 100.
 
       ebot_iwm(:,:) = ebot_iwm(:,:) * ssmask(:,:)

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/tests/demo_cfgs.txt

@@ -6 +6 @@
 VORTEX OCE NST
 WAD OCE
+BENCH OCE