Changeset 2848 for branches/2011/dev_r2802_MERCATOR10_diadct

Timestamp:

2011-09-21T12:33:48+02:00 (13 years ago)

Author:

cbricaud

Message:

add routines for online transports computing

Location:

branches/2011/dev_r2802_MERCATOR10_diadct/NEMOGCM/NEMO/OPA_SRC

Files:

• DIA/diadct.F90 (added)
• IOM/in_out_manager.F90 (modified) (1 diff)
• nemogcm.F90 (modified) (3 diffs)
• step.F90 (modified) (1 diff)
• step_oce.F90 (modified) (1 diff)

branches/2011/dev_r2802_MERCATOR10_diadct/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90

@@ -105 +105 @@
    !!                        logical units
    !!----------------------------------------------------------------------
-   INTEGER ::   numstp     =   -1      !: logical unit for time step
-   INTEGER ::   numout     =    6      !: logical unit for output print
-   INTEGER ::   numnam     =   -1      !: logical unit for namelist
-   INTEGER ::   numnam_ice =   -1      !: logical unit for ice namelist
-   INTEGER ::   numevo_ice =   -1      !: logical unit for ice variables (temp. evolution)
-   INTEGER ::   numsol     =   -1      !: logical unit for solver statistics
+   INTEGER ::   numstp      =   -1      !: logical unit for time step
+   INTEGER ::   numout      =    6      !: logical unit for output print
+   INTEGER ::   numnam      =   -1      !: logical unit for namelist
+   INTEGER ::   numnam_ice  =   -1      !: logical unit for ice namelist
+   INTEGER ::   numevo_ice  =   -1      !: logical unit for ice variables (temp. evolution)
+   INTEGER ::   numsol      =   -1      !: logical unit for solver statistics
+   INTEGER ::   numdct_in   =   -1      !: logical unit for transports computing
+   INTEGER ::   numdct_vol  =   -1      !: logical unit for voulume transports output
+   INTEGER ::   numdct_heat =   -1      !: logical unit for heat    transports output
+   INTEGER ::   numdct_salt =   -1      !: logical unit for salt    transports output
 
    !!----------------------------------------------------------------------

branches/2011/dev_r2802_MERCATOR10_diadct/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -57 +57 @@
    USE sshwzv          ! vertical velocity used in asm
    USE diaptr          ! poleward transports           (dia_ptr_init routine)
+   USE diadct          ! sections transports           (dia_dct_init routine)
    USE diaobs          ! Observation diagnostics       (dia_obs_init routine)
    USE step            ! NEMO time-stepping                 (stp     routine)
@@ -345 +346 @@
       IF( lk_diaar5     )   CALL dia_ar5_init   ! ar5 diag
                             CALL dia_ptr_init   ! Poleward TRansports initialization
+      IF( lk_diadct     )   CALL dia_dct_init   ! Sections tranports
                             CALL dia_hsb_init   ! heat content, salt content and volume budgets
                             CALL trd_mod_init   ! Mixed-layer/Vorticity/Integral constraints trends
@@ -456 +458 @@
       CALL iom_close                                 ! close all input/output files managed by iom_*
       !
-      IF( numstp     /= -1 )   CLOSE( numstp     )   ! time-step file
-      IF( numsol     /= -1 )   CLOSE( numsol     )   ! solver file
-      IF( numnam     /= -1 )   CLOSE( numnam     )   ! oce namelist
-      IF( numnam_ice /= -1 )   CLOSE( numnam_ice )   ! ice namelist
-      IF( numevo_ice /= -1 )   CLOSE( numevo_ice )   ! ice variables (temp. evolution)
-      IF( numout     /=  6 )   CLOSE( numout     )   ! standard model output file
+      IF( numstp      /= -1 )   CLOSE( numstp      )   ! time-step file
+      IF( numsol      /= -1 )   CLOSE( numsol      )   ! solver file
+      IF( numnam      /= -1 )   CLOSE( numnam      )   ! oce namelist
+      IF( numnam_ice  /= -1 )   CLOSE( numnam_ice  )   ! ice namelist
+      IF( numevo_ice  /= -1 )   CLOSE( numevo_ice  )   ! ice variables (temp. evolution)
+      IF( numout      /=  6 )   CLOSE( numout      )   ! standard model output file
+      IF( numdct_vol  /= -1 )   CLOSE( numdct_vol  )   ! volume transports
+      IF( numdct_heat /= -1 )   CLOSE( numdct_heat )   ! heat transports
+      IF( numdct_salt /= -1 )   CLOSE( numdct_salt )   ! salt transports
+
       !
       numout = 6                                     ! redefine numout in case it is used after this point...

branches/2011/dev_r2802_MERCATOR10_diadct/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -164 +164 @@
       IF( lk_diafwb  )   CALL dia_fwb( kstp )         ! Fresh water budget diagnostics
       IF( ln_diaptr  )   CALL dia_ptr( kstp )         ! Poleward TRansports diagnostics
+      IF( lk_diadct  )   CALL dia_dct( kstp )         ! Transports
       IF( lk_diaar5  )   CALL dia_ar5( kstp )         ! ar5 diag
                          CALL dia_wri( kstp )         ! ocean model: outputs

branches/2011/dev_r2802_MERCATOR10_diadct/NEMOGCM/NEMO/OPA_SRC/step_oce.F90

@@ -81 +81 @@
    USE trdvor           ! vorticity budget                 (trd_vor routine)
    USE diaptr           ! poleward transports              (dia_ptr routine)
+   USE diadct           ! sections transports              (dia_dct routine)
    USE diaar5           ! AR5 diagnosics                   (dia_ar5 routine)
    USE diahth           ! thermocline depth                (dia_hth routine)