Changeset 5866 for branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90

Timestamp:

2015-11-06T11:42:35+01:00 (8 years ago)

Author:

gm

Message:

#1613: vvl by default: add ln_linssh and remove key_vvl

File:

• branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90 (modified) (7 diffs)

branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90

@@ -182 +182 @@
             !                                             ! ------------------------- !
             ! Set chlorophyl concentration
-            IF( nn_chldta == 1 .OR. lk_vvl ) THEN            !*  Variable Chlorophyll or ocean volume
+            IF( nn_chldta == 1 .OR. .NOT.ln_linssh ) THEN            !*  Variable Chlorophyll or ocean volume
                !
                IF( nn_chldta == 1 ) THEN                             !*  Variable Chlorophyll
@@ -261 +261 @@
             !                                             ! ------------------------- !
             !
-            IF( lk_vvl ) THEN                                  !* variable volume
+            IF( .NOT.ln_linssh ) THEN                                  !* variable volume
                zz0   =        rn_abs   * r1_rau0_rcp
                zz1   = ( 1. - rn_abs ) * r1_rau0_rcp
@@ -376 +376 @@
       IF( nn_timing == 1 )  CALL timing_start('tra_qsr_init')
       !
-      CALL wrk_alloc( jpi, jpj,      zekb, zekg, zekr        ) 
-      CALL wrk_alloc( jpi, jpj, jpk, ze0, ze1, ze2, ze3, zea ) 
+      CALL wrk_alloc( jpi,jpj,       zekb, zekg, zekr        ) 
+      CALL wrk_alloc( jpi,jpj,jpk,   ze0, ze1, ze2, ze3, zea ) 
       !
 
@@ -470 +470 @@
                IF(lwp) WRITE(numout,*)
                IF(lwp) WRITE(numout,*) '        Constant Chlorophyll concentration = 0.05'
-               IF( lk_vvl ) THEN                   ! variable volume
-                  IF(lwp) WRITE(numout,*) '        key_vvl: light distribution will be computed at each time step'
+               IF( .NOT.ln_linssh ) THEN                   ! variable volume
+                  IF(lwp) WRITE(numout,*) '        non-linear free surface: light distribution will be computed at each time step'
                ELSE                                ! constant volume: computes one for all
-                  IF(lwp) WRITE(numout,*) '        fixed volume: light distribution computed one for all'
+                  IF(lwp) WRITE(numout,*) '        linear free surface: light distribution computed one for all'
                   !
                   zchl = 0.05                                 ! constant chlorophyll
@@ -524 +524 @@
             ENDIF
             !
-            IF( lk_vvl ) THEN                   ! variable volume
-               IF(lwp) WRITE(numout,*) '        key_vvl: light distribution will be computed at each time step'
+            IF( .NOT.ln_linssh ) THEN                   ! variable volume
+               IF(lwp) WRITE(numout,*) '        non-linear free surface: light distribution will be computed at each time step'
             ELSE                                ! constant volume: computes one for all
                zz0 =        rn_abs   * r1_rau0_rcp
@@ -538 +538 @@
                   END DO
                END DO
-               etot3(:,:,nksr+1:jpk) = 0.e0                   ! below 400m set to zero
+               etot3(:,:,nksr+1:jpk) = 0._wp                  ! below 400m set to zero
                !
             ENDIF
@@ -559 +559 @@
       ENDIF
       !
-      CALL wrk_dealloc( jpi, jpj,      zekb, zekg, zekr        ) 
-      CALL wrk_dealloc( jpi, jpj, jpk, ze0, ze1, ze2, ze3, zea ) 
+      CALL wrk_dealloc( jpi,jpj,       zekb, zekg, zekr        ) 
+      CALL wrk_dealloc( jpi,jpj,jpk,   ze0, ze1, ze2, ze3, zea ) 
       !
       IF( nn_timing == 1 )  CALL timing_stop('tra_qsr_init')