Changeset 592 for trunk/NEMO/OPA_SRC/TRA/trabbc.F90

Timestamp:

2007-02-09T10:15:25+01:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_update_001 : CT : - add non linear free surface (variable volume) with new cpp key key_vvl

File:

• trunk/NEMO/OPA_SRC/TRA/trabbc.F90 (modified) (8 diffs)

trunk/NEMO/OPA_SRC/TRA/trabbc.F90

@@ -37 +37 @@
 
    INTEGER , DIMENSION(jpi,jpj) ::   nbotlevt   ! ocean bottom level index at T-pt
-   REAL(wp), DIMENSION(jpi,jpj) ::   qgh_trd    ! geothermal heating trend
+   REAL(wp), DIMENSION(jpi,jpj) ::   qgh_trd0   ! geothermal heating trend
  
    !! * Substitutions
@@ -80 +80 @@
       INTEGER ::   ji, jj   ! dummy loop indices
 #endif
+      REAL(wp) ::   zqgh_trd  ! geothermal heat flux trend
       !!----------------------------------------------------------------------
 
@@ -96 +97 @@
 #if defined key_vectopt_loop   &&   ! defined key_mpp_omp
          DO ji = jpi+2, jpij-jpi-1   ! vector opt. (forced unrolling)
-            ta(ji,1,nbotlevt(ji,1)) = ta(ji,1,nbotlevt(ji,1)) + qgh_trd(ji,1)
+            zqgh_trd = ro0cpr * qgh_trd0(ji,1) / fse3t(ji,1,nbotlevt(ji,1) )
+            ta(ji,1,nbotlevt(ji,1)) = ta(ji,1,nbotlevt(ji,1)) + zqgh_trd
          END DO
 #else
          DO jj = 2, jpjm1
             DO ji = 2, jpim1
-               ta(ji,jj,nbotlevt(ji,jj)) = ta(ji,jj,nbotlevt(ji,jj)) + qgh_trd(ji,jj)
+               zqgh_trd = ro0cpr * qgh_trd0(ji,jj) / fse3t(ji,jj,nbotlevt(ji,jj))
+               ta(ji,jj,nbotlevt(ji,jj)) = ta(ji,jj,nbotlevt(ji,jj)) + zqgh_trd
             END DO
          END DO
@@ -131 +134 @@
       !!              - NetCDF file  : geothermal_heating.nc ( if necessary )
       !!
-      !! ** Action  : - compute the heat geothermal trend qgh_trd
+      !! ** Action  : - read/fix the geothermal heat qgh_trd0
       !!              - compute the bottom ocean level nbotlevt
       !!----------------------------------------------------------------------
@@ -162 +165 @@
       END DO
 
-
       SELECT CASE ( ngeo_flux )      ! initialization of geothermal heat flux
       !
@@ -171 +173 @@
       CASE ( 1 )                ! constant flux
          IF(lwp) WRITE(numout,*) '             *** constant heat flux  =   ', ngeo_flux_const
-         qgh_trd(:,:) = ngeo_flux_const
+         qgh_trd0(:,:) = ngeo_flux_const
          !
       CASE ( 2 )                ! variable geothermal heat flux
@@ -178 +180 @@
          IF(lwp) WRITE(numout,*) '             *** variable geothermal heat flux'
          CALL iom_open ( 'geothermal_heating.nc', inum )
-         CALL iom_get ( inum, jpdom_data, 'heatflow', qgh_trd )
+         CALL iom_get ( inum, jpdom_data, 'heatflow', qgh_trd0 )
          CALL iom_close (inum)
          !
-         qgh_trd(:,:) = qgh_trd(:,:) * 1.e-3 ! conversion in W/m2
+         qgh_trd0(:,:) = qgh_trd0(:,:) * 1.e-3 ! conversion in W/m2
          !
       CASE DEFAULT
@@ -189 +191 @@
       END SELECT
 
-      ! geothermal heat flux trend
-
-      SELECT CASE ( ngeo_flux )
-      !
-      CASE ( 1:2 )                !  geothermal heat flux
-#if defined key_vectopt_loop   &&   ! defined key_mpp_omp
-         DO ji = 1, jpij   ! vector opt. (forced unrolling)
-            qgh_trd(ji,1) = ro0cpr * qgh_trd(ji,1) / fse3t(ji,1,nbotlevt(ji,1) )
-         END DO
-#else
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               qgh_trd(ji,jj) = ro0cpr * qgh_trd(ji,jj) / fse3t(ji,jj,nbotlevt(ji,jj))
-            END DO
-         END DO
-#endif
-      END SELECT
-      !
+
    END SUBROUTINE tra_bbc_init