Context Navigation

← Previous Change
Next Change →

PISCES

Timestamp:

2020-07-03T11:12:53+02:00 (4 years ago)

Author:

smasson

Message:

trunk: Mid-year merge, merge back KERNEL-06_techene_e3

Location:

NEMO/trunk/src/TOP/PISCES

Files:

: 20 edited

P2Z/p2zbio.F90 (modified) (1 diff)
P2Z/p2zexp.F90 (modified) (1 diff)
P2Z/p2zopt.F90 (modified) (1 diff)
P2Z/p2zsed.F90 (modified) (1 diff)
P4Z/p4zbc.F90 (modified) (1 diff)
P4Z/p4zbio.F90 (modified) (1 diff)
P4Z/p4zche.F90 (modified) (1 diff)
P4Z/p4zfechem.F90 (modified) (1 diff)
P4Z/p4zflx.F90 (modified) (1 diff)
P4Z/p4zopt.F90 (modified) (1 diff)
P4Z/p4zpoc.F90 (modified) (1 diff)
P4Z/p4zprod.F90 (modified) (1 diff)
P4Z/p4zrem.F90 (modified) (1 diff)
P4Z/p4zsed.F90 (modified) (1 diff)
P4Z/p4zsink.F90 (modified) (1 diff)
P4Z/p4zsms.F90 (modified) (1 diff)
P4Z/p5zprod.F90 (modified) (1 diff)
SED/oce_sed.F90 (modified) (2 diffs)
SED/seddta.F90 (modified) (2 diffs)
trcwri_pisces.F90 (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

NEMO/trunk/src/TOP/PISCES/P2Z/p2zbio.F90

r13226	r13237
58	58	!! * Substitutions
59	59	# include "do_loop_substitute.h90"
	60	# include "domzgr_substitute.h90"
60	61	!!----------------------------------------------------------------------
61	62	!! NEMO/TOP 4.0 , NEMO Consortium (2018)

NEMO/trunk/src/TOP/PISCES/P2Z/p2zexp.F90

r13226	r13237
39	39	!! * Substitutions
40	40	# include "do_loop_substitute.h90"
	41	# include "domzgr_substitute.h90"
41	42	!!----------------------------------------------------------------------
42	43	!! NEMO/TOP 4.0 , NEMO Consortium (2018)

NEMO/trunk/src/TOP/PISCES/P2Z/p2zopt.F90

r12377	r13237
40	40	!! * Substitutions
41	41	# include "do_loop_substitute.h90"
	42	# include "domzgr_substitute.h90"
42	43	!!----------------------------------------------------------------------
43	44	!! NEMO/TOP 4.0 , NEMO Consortium (2018)

NEMO/trunk/src/TOP/PISCES/P2Z/p2zsed.F90

r12377	r13237
33	33	!! * Substitutions
34	34	# include "do_loop_substitute.h90"
	35	# include "domzgr_substitute.h90"
35	36	!!----------------------------------------------------------------------
36	37	!! NEMO/TOP 4.0 , NEMO Consortium (2018)

NEMO/trunk/src/TOP/PISCES/P4Z/p4zbc.F90

r13226	r13237
48	48	!! * Substitutions
49	49	# include "do_loop_substitute.h90"
	50	# include "domzgr_substitute.h90"
50	51	!!----------------------------------------------------------------------
51	52	!! NEMO/TOP 4.0 , NEMO Consortium (2018)

NEMO/trunk/src/TOP/PISCES/P4Z/p4zbio.F90

r12377	r13237
40	40	!! * Substitutions
41	41	# include "do_loop_substitute.h90"
	42	# include "domzgr_substitute.h90"
42	43	!!----------------------------------------------------------------------
43	44	!! NEMO/TOP 4.0 , NEMO Consortium (2018)

NEMO/trunk/src/TOP/PISCES/P4Z/p4zche.F90

r12377	r13237
132	132	!! * Substitutions
133	133	# include "do_loop_substitute.h90"
	134	# include "domzgr_substitute.h90"
134	135	!!----------------------------------------------------------------------
135	136	!! NEMO/TOP 4.0 , NEMO Consortium (2018)

NEMO/trunk/src/TOP/PISCES/P4Z/p4zfechem.F90

r12377	r13237
33	33	!! * Substitutions
34	34	# include "do_loop_substitute.h90"
	35	# include "domzgr_substitute.h90"
35	36	!!----------------------------------------------------------------------
36	37	!! NEMO/TOP 4.0 , NEMO Consortium (2018)

NEMO/trunk/src/TOP/PISCES/P4Z/p4zflx.F90

r12377	r13237
54	54	!! * Substitutions
55	55	# include "do_loop_substitute.h90"
	56	# include "domzgr_substitute.h90"
56	57	!!----------------------------------------------------------------------
57	58	!! NEMO/TOP 4.0 , NEMO Consortium (2018)

NEMO/trunk/src/TOP/PISCES/P4Z/p4zopt.F90

r13226	r13237
44	44	!! * Substitutions
45	45	# include "do_loop_substitute.h90"
	46	# include "domzgr_substitute.h90"
46	47	!!----------------------------------------------------------------------
47	48	!! NEMO/TOP 4.0 , NEMO Consortium (2018)

NEMO/trunk/src/TOP/PISCES/P4Z/p4zpoc.F90

r12377	r13237
39	39	!! * Substitutions
40	40	# include "do_loop_substitute.h90"
	41	# include "domzgr_substitute.h90"
41	42	!!----------------------------------------------------------------------
42	43	!! NEMO/TOP 4.0 , NEMO Consortium (2018)

NEMO/trunk/src/TOP/PISCES/P4Z/p4zprod.F90

r12377	r13237
48	48	!! * Substitutions
49	49	# include "do_loop_substitute.h90"
	50	# include "domzgr_substitute.h90"
50	51	!!----------------------------------------------------------------------
51	52	!! NEMO/TOP 4.0 , NEMO Consortium (2018)

NEMO/trunk/src/TOP/PISCES/P4Z/p4zrem.F90

r12377	r13237
44	44	!! * Substitutions
45	45	# include "do_loop_substitute.h90"
	46	# include "domzgr_substitute.h90"
46	47	!!----------------------------------------------------------------------
47	48	!! NEMO/TOP 4.0 , NEMO Consortium (2018)

NEMO/trunk/src/TOP/PISCES/P4Z/p4zsed.F90

r12377	r13237
39	39	!! * Substitutions
40	40	# include "do_loop_substitute.h90"
	41	# include "domzgr_substitute.h90"
41	42	!!----------------------------------------------------------------------
42	43	!! NEMO/TOP 4.0 , NEMO Consortium (2018)

NEMO/trunk/src/TOP/PISCES/P4Z/p4zsink.F90

r12377	r13237
40	40	!! * Substitutions
41	41	# include "do_loop_substitute.h90"
	42	# include "domzgr_substitute.h90"
42	43	!!----------------------------------------------------------------------
43	44	!! NEMO/TOP 4.0 , NEMO Consortium (2018)

NEMO/trunk/src/TOP/PISCES/P4Z/p4zsms.F90

r13030	r13237
41	41	!! * Substitutions
42	42	# include "do_loop_substitute.h90"
	43	# include "domzgr_substitute.h90"
43	44	!!----------------------------------------------------------------------
44	45	!! NEMO/TOP 4.0 , NEMO Consortium (2018)

NEMO/trunk/src/TOP/PISCES/P4Z/p5zprod.F90

r12377	r13237
52	52	!! * Substitutions
53	53	# include "do_loop_substitute.h90"
	54	# include "domzgr_substitute.h90"
54	55	!!----------------------------------------------------------------------
55	56	!! NEMO/TOP 4.0 , NEMO Consortium (2018)

NEMO/trunk/src/TOP/PISCES/SED/oce_sed.F90

-                      r12489
+                      r13237
    USE dom_oce , ONLY :   glamt     =>   glamt          !: longitude of t-point (degre)
    USE dom_oce , ONLY :   gphit     =>   gphit          !: latitude  of t-point (degre)
+!!st
+#if ! defined key_qco
    USE dom_oce , ONLY :   e3t       =>   e3t            !: latitude  of t-point (degre)
+#endif
    USE dom_oce , ONLY :   e3t_1d    =>   e3t_1d         !: reference depth of t-points (m)
    USE dom_oce , ONLY :   gdepw_0   =>   gdepw_0        !: reference depth of t-points (m)
 …
 END MODULE oce_sed

NEMO/trunk/src/TOP/PISCES/SED/seddta.F90

-                      r12489
+                      r13237
    !! * Substitutions
 #  include "do_loop_substitute.h90"
+#  include "domzgr_substitute.h90"
    !! $Id$
 CONTAINS
 …
       CALL pack_arr ( jpoce,  rainrm_dta(1:jpoce,jscal), trc_data(1:jpi,1:jpj,14), iarroce(1:jpoce) )
       rainrm_dta(1:jpoce,jscal) = rainrm_dta(1:jpoce,jscal) * 1e-4
       ! vector temperature [°C] and salinity
+      ! vector temperature [�C] and salinity
       CALL pack_arr ( jpoce,  temp(1:jpoce), trc_data(1:jpi,1:jpj,15), iarroce(1:jpoce) )
       CALL pack_arr ( jpoce,  salt(1:jpoce), trc_data(1:jpi,1:jpj,16), iarroce(1:jpoce) )

NEMO/trunk/src/TOP/PISCES/trcwri_pisces.F90

r12377	r13237
21	21	!! * Substitutions
22	22	# include "do_loop_substitute.h90"
	23	# include "domzgr_substitute.h90"
23	24	!!----------------------------------------------------------------------
24	25	!! NEMO/TOP 4.0 , NEMO Consortium (2018)

Note: See TracChangeset for help on using the changeset viewer.

New URL for NEMO forge! http://forge.nemo-ocean.eu