Changeset 14822 for NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/src/TOP/trc.F90

Timestamp:

2021-05-10T13:32:16+02:00 (3 years ago)

Author:

smueller

Message:

Synchronizing with ^{/NEMO/trunk@14820 (ticket #2353)}

Location:

NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining

Files:

• . (modified) (1 prop)
• src/TOP/trc.F90 (modified) (2 diffs)

NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining

@@ -1 @@
-^/utils/build/arch@14122      arch
-^/utils/build/makenemo@14122  makenemo
-^/utils/build/mk@14122        mk
-^/utils/tools@14122           tools
-^/vendors/AGRIF/dev@14122     ext/AGRIF
-^/vendors/FCM@14122           ext/FCM
-^/vendors/IOIPSL@14122        ext/IOIPSL
-^/vendors/PPR@14122           ext/PPR
+^/utils/build/arch@HEAD       arch
+^/utils/build/makenemo@HEAD   makenemo
+^/utils/build/mk@HEAD         mk
+^/utils/tools@HEAD            tools
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/FCM@HEAD            ext/FCM
+^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette_wave@13990         sette
+^/utils/CI/sette@14244        sette

@@ -1 @@
-^/utils/build/arch@14122      arch
-^/utils/build/makenemo@14122  makenemo
-^/utils/build/mk@14122        mk
-^/utils/tools@14122           tools
-^/vendors/AGRIF/dev@14122     ext/AGRIF
-^/vendors/FCM@14122           ext/FCM
-^/vendors/IOIPSL@14122        ext/IOIPSL
-^/vendors/PPR@14122           ext/PPR
+^/utils/build/arch@HEAD       arch
+^/utils/build/makenemo@HEAD   makenemo
+^/utils/build/mk@HEAD         mk
+^/utils/tools@HEAD            tools
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/FCM@HEAD            ext/FCM
+^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette_wave@13990         sette
+^/utils/CI/sette@14244        sette

NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/src/TOP/trc.F90

@@ -82 +82 @@
    CHARACTER(len=2), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:) ::   cn_trc_o         !: choice of ocean tracer cc
 
+   !! Information for the optics module
+   !! ---------------------------------
+   INTEGER , ALLOCATABLE, SAVE, DIMENSION(:,:)   ::  neln       !: number of T-levels + 1 in the euphotic layer
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:)   ::  heup       !: euphotic layer depth
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:)   ::  heup_01    !: Absolute euphotic layer depth
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::  etot       !: par (photosynthetic available radiation)
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::  etot_ndcy  !: PAR over 24h in case of diurnal cycle
+
 
    !! information for outputs
@@ -156 +164 @@
          &      gtrui(jpi,jpj,jptra)  , gtrvi(jpi,jpj,jptra)                          ,       &
          &      trc_ice_ratio(jptra)  , trc_ice_prescr(jptra) , cn_trc_o(jptra)       ,       &
+         &      neln(jpi,jpj)         , heup(jpi,jpj)         , heup_01(jpi,jpj)      ,       &
+         &      etot(jpi,jpj,jpk)     , etot_ndcy(jpi,jpj,jpk)                        ,       &
          &      sbc_trc_b(jpi,jpj,jptra), sbc_trc(jpi,jpj,jptra)                      ,       &  
          &      cvol(jpi,jpj,jpk)     , trai(jptra)           , qsr_mean(jpi,jpj)     ,       &

@@ -1 @@
-^/utils/build/arch@14122      arch
-^/utils/build/makenemo@14122  makenemo
-^/utils/build/mk@14122        mk
-^/utils/tools@14122           tools
-^/vendors/AGRIF/dev@14122     ext/AGRIF
-^/vendors/FCM@14122           ext/FCM
-^/vendors/IOIPSL@14122        ext/IOIPSL
-^/vendors/PPR@14122           ext/PPR
+^/utils/build/arch@HEAD       arch
+^/utils/build/makenemo@HEAD   makenemo
+^/utils/build/mk@HEAD         mk
+^/utils/tools@HEAD            tools
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/FCM@HEAD            ext/FCM
+^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette_wave@13990         sette
+^/utils/CI/sette@14244        sette