Changeset 9169 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA

Timestamp:

2017-12-26T17:32:56+01:00 (6 years ago)

Author:

gm

Message:

dev_merge_2017: all SRC: finalize the removal of useless warning when reading namelist_cfg + remove all nn_closea + nn_msh replaced by a logical

Location:

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA

Files:

• eosbn2.F90 (modified) (4 diffs)
• traqsr.F90 (modified) (4 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90

@@ -1272 +1272 @@
       CASE( np_teos10 )                       !==  polynomial TEOS-10  ==!
          IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) '          use of TEOS-10 equation of state (cons. temp. and abs. salinity)'
+         IF(lwp) WRITE(numout,*) '   ==>>>   use of TEOS-10 equation of state (cons. temp. and abs. salinity)'
          !
          l_useCT = .TRUE.                          ! model temperature is Conservative temperature 
@@ -1464 +1464 @@
          !
          IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) '          use of EOS-80 equation of state (pot. temp. and pract. salinity)'
+         IF(lwp) WRITE(numout,*) '   ==>>>   use of EOS-80 equation of state (pot. temp. and pract. salinity)'
          !
          l_useCT = .FALSE.                         ! model temperature is Potential temperature
@@ -1655 +1655 @@
          IF(lwp) THEN
             WRITE(numout,*)
-            WRITE(numout,*) '          use of simplified eos:    rhd(dT=T-10,dS=S-35,Z) = '
-            WRITE(numout,*) '             [-a0*(1+lambda1/2*dT+mu1*Z)*dT + b0*(1+lambda2/2*dT+mu2*Z)*dS - nu*dT*dS]/rau0'
-            WRITE(numout,*)
-            WRITE(numout,*) '             thermal exp. coef.    rn_a0      = ', rn_a0
-            WRITE(numout,*) '             saline  cont. coef.   rn_b0      = ', rn_b0
-            WRITE(numout,*) '             cabbeling coef.       rn_lambda1 = ', rn_lambda1
-            WRITE(numout,*) '             cabbeling coef.       rn_lambda2 = ', rn_lambda2
-            WRITE(numout,*) '             thermobar. coef.      rn_mu1     = ', rn_mu1
-            WRITE(numout,*) '             thermobar. coef.      rn_mu2     = ', rn_mu2
-            WRITE(numout,*) '             2nd cabbel. coef.     rn_nu      = ', rn_nu
-            WRITE(numout,*) '               Caution: rn_beta0=0 incompatible with ddm parameterization '
+            WRITE(numout,*) '   ==>>>   use of simplified eos:    '
+            WRITE(numout,*) '              rhd(dT=T-10,dS=S-35,Z) = [-a0*(1+lambda1/2*dT+mu1*Z)*dT '
+            WRITE(numout,*) '                                       + b0*(1+lambda2/2*dT+mu2*Z)*dS - nu*dT*dS] / rau0'
+            WRITE(numout,*) '              with the following coefficients :'
+            WRITE(numout,*) '                 thermal exp. coef.    rn_a0      = ', rn_a0
+            WRITE(numout,*) '                 saline  cont. coef.   rn_b0      = ', rn_b0
+            WRITE(numout,*) '                 cabbeling coef.       rn_lambda1 = ', rn_lambda1
+            WRITE(numout,*) '                 cabbeling coef.       rn_lambda2 = ', rn_lambda2
+            WRITE(numout,*) '                 thermobar. coef.      rn_mu1     = ', rn_mu1
+            WRITE(numout,*) '                 thermobar. coef.      rn_mu2     = ', rn_mu2
+            WRITE(numout,*) '                 2nd cabbel. coef.     rn_nu      = ', rn_nu
+            WRITE(numout,*) '              Caution: rn_beta0=0 incompatible with ddm parameterization '
          ENDIF
          l_useCT = .TRUE.          ! Use conservative temperature
@@ -1682 +1683 @@
       IF(lwp) THEN
          IF( l_useCT )   THEN
-            WRITE(numout,*) '             model uses Conservative Temperature'
-            WRITE(numout,*) '             Important: model must be initialized with CT and SA fields'
+            WRITE(numout,*)
+            WRITE(numout,*) '   ==>>>   model uses Conservative Temperature'
+            WRITE(numout,*) '           Important: model must be initialized with CT and SA fields'
          ELSE
-            WRITE(numout,*) '             model does not use Conservative Temperature'
+            WRITE(numout,*)
+            WRITE(numout,*) '   ==>>>   model does not use Conservative Temperature'
          ENDIF
       ENDIF
       !
       IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) '          volumic mass of reference           rau0  = ', rau0   , ' kg/m^3'
-      IF(lwp) WRITE(numout,*) '          1. / rau0                        r1_rau0  = ', r1_rau0, ' m^3/kg'
-      IF(lwp) WRITE(numout,*) '          ocean specific heat                 rcp   = ', rcp    , ' J/Kelvin'
-      IF(lwp) WRITE(numout,*) '          rau0 * rcp                       rau0_rcp = ', rau0_rcp
-      IF(lwp) WRITE(numout,*) '          1. / ( rau0 * rcp )           r1_rau0_rcp = ', r1_rau0_rcp
+      IF(lwp) WRITE(numout,*) '   Associated physical constant'
+      IF(lwp) WRITE(numout,*) '      volumic mass of reference           rau0  = ', rau0   , ' kg/m^3'
+      IF(lwp) WRITE(numout,*) '      1. / rau0                        r1_rau0  = ', r1_rau0, ' m^3/kg'
+      IF(lwp) WRITE(numout,*) '      ocean specific heat                 rcp   = ', rcp    , ' J/Kelvin'
+      IF(lwp) WRITE(numout,*) '      rau0 * rcp                       rau0_rcp = ', rau0_rcp
+      IF(lwp) WRITE(numout,*) '      1. / ( rau0 * rcp )           r1_rau0_rcp = ', r1_rau0_rcp
       !
    END SUBROUTINE eos_init

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90

@@ -379 +379 @@
       CASE( np_RGB , np_RGBc )         !==  Red-Green-Blue light penetration  ==!
          !                             
-         IF(lwp)   WRITE(numout,*) '   R-G-B   light penetration '
+         IF(lwp)   WRITE(numout,*) '   ==>>>   R-G-B   light penetration '
          !
          CALL trc_oce_rgb( rkrgb )                 ! tabulated attenuation coef.
@@ -388 +388 @@
          !
          IF( nqsr == np_RGBc ) THEN                ! Chl data : set sf_chl structure
-            IF(lwp) WRITE(numout,*) '        Chlorophyll read in a file'
+            IF(lwp) WRITE(numout,*) '   ==>>>   Chlorophyll read in a file'
             ALLOCATE( sf_chl(1), STAT=ierror )
             IF( ierror > 0 ) THEN
@@ -400 +400 @@
          ENDIF
          IF( nqsr == np_RGB ) THEN                 ! constant Chl
-            IF(lwp) WRITE(numout,*) '        Constant Chlorophyll concentration = 0.05'
+            IF(lwp) WRITE(numout,*) '   ==>>>   Constant Chlorophyll concentration = 0.05'
          ENDIF
          !
       CASE( np_2BD )                   !==  2 bands light penetration  ==!
          !
-         IF(lwp)  WRITE(numout,*) '   2 bands light penetration'
+         IF(lwp)  WRITE(numout,*) '   ==>>>   2 bands light penetration'
          !
          nksr = trc_oce_ext_lev( rn_si1, 100._wp )    ! level of light extinction
@@ -412 +412 @@
       CASE( np_BIO )                   !==  BIO light penetration  ==!
          !
-         IF(lwp) WRITE(numout,*) '   bio-model light penetration'
+         IF(lwp) WRITE(numout,*) '   ==>>>   bio-model light penetration'
          IF( .NOT.lk_top )   CALL ctl_stop( 'No bio model : ln_qsr_bio = true impossible ' )
          !