Changeset 8673 for branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO

Timestamp:

2017-11-06T17:20:08+01:00 (7 years ago)

Author:

jpalmier

Message:

JPALM -- include odd and even var group in IOM.F90 - secure SMS trends in MEDUSA - create odd and even group in fiel_def_bgc

Location:

branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO

Files:

• OPA_SRC/IOM/iom.F90 (modified) (2 diffs)
• TOP_SRC/MEDUSA/trcsms_medusa.F90 (modified) (4 diffs)

branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

@@ -1634 +1634 @@
       WRITE(cl1,'(i1)')        2   ;   CALL iom_set_field_attr('trendT_even'      , freq_op=cl1//'ts', freq_offset='0ts')
       WRITE(cl1,'(i1)')        2   ;   CALL iom_set_field_attr('trendT_odd'       , freq_op=cl1//'ts', freq_offset='-1ts')
+      WRITE(cl1,'(i1)')        2   ;   CALL iom_set_field_attr('ptrd_T_even'      , freq_op=cl1//'ts', freq_offset='0ts')
+      WRITE(cl1,'(i1)')        2   ;   CALL iom_set_field_attr('ptrd_T_odd'       , freq_op=cl1//'ts', freq_offset='-1ts')
       WRITE(cl1,'(i1)')  nn_fsbc   ;   CALL iom_set_field_attr('SBC'             , freq_op=cl1//'ts', freq_offset='0ts')
       WRITE(cl1,'(i1)')  nn_fsbc   ;   CALL iom_set_field_attr('SBC_scalar'      , freq_op=cl1//'ts', freq_offset='0ts')
@@ -1642 +1644 @@
       f_op%timestep = 2        ;  f_of%timestep = 0  ; CALL iom_set_field_attr('trendT_even'      , freq_op=f_op, freq_offset=f_of)
       f_op%timestep = 2        ;  f_of%timestep = -1 ; CALL iom_set_field_attr('trendT_odd'       , freq_op=f_op, freq_offset=f_of)
+      f_op%timestep = 2        ;  f_of%timestep = 0  ; CALL iom_set_field_attr('ptrd_T_even'      , freq_op=f_op, freq_offset=f_of)
+      f_op%timestep = 2        ;  f_of%timestep = -1 ; CALL iom_set_field_attr('ptrd_T_odd'       , freq_op=f_op, freq_offset=f_of)
       f_op%timestep = nn_fsbc  ;  f_of%timestep = 0  ; CALL iom_set_field_attr('SBC'             , freq_op=f_op, freq_offset=f_of)
       f_op%timestep = nn_fsbc  ;  f_of%timestep = 0  ; CALL iom_set_field_attr('SBC_scalar'      , freq_op=f_op, freq_offset=f_of)

branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcsms_medusa.F90

@@ -23 +23 @@
    USE trcavg_medusa
    !! for SMS trends
-   USE par_medusa,    ONLY: jp_msa0, jp_msa1
+   USE par_medusa,    ONLY: jp_msa0, jp_msa1, jp_medusa
    USE par_oce,       ONLY: jpi, jpj, jpk
    USE trd_oce,       ONLY: jptra_sms, l_trdtrc
@@ -54 +54 @@
       INTEGER :: jn
       !! trend temporary array:
-      REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrmed
+      REAL(wp), POINTER, DIMENSION(:,:,:,:) :: ztrmed
 
 
@@ -67 +67 @@
        IF(lwp) WRITE(numout,*) ' ~~~~~~~~~~~~~~'
       ENDIF
+
+      !! MEDUSA SMS trends:
+      IF( l_trdtrc ) THEN
+          CALL wrk_alloc( jpi, jpj, jpk, jp_medusa, ztrmed )
+          ztrmed(:,:,:,:)=0.0  
+          DO jn = 1, jp_medusa
+            ztrmed(:,:,:,jn) = tra(:,:,:,jp_msa0 + jn - 1)
+          END DO
+      END IF
 
       CALL trc_avg_medusa( kt ) ! rolling average module
@@ -107 +116 @@
       !! MEDUSA SMS trends:
       IF( l_trdtrc ) THEN
-          CALL wrk_alloc( jpi, jpj, jpk, ztrmed )
-          DO jn = jp_msa0, jp_msa1
-            ztrmed(:,:,:) = tra(:,:,:,jn)
-            CALL trd_trc( ztrmed, jn, jptra_sms, kt )   ! save trends
+          DO jn = 1, jp_medusa
+            ztrmed(:,:,:,jn) = tra(:,:,:,jp_msa0 + jn - 1)-ztrmed(:,:,:,jn)
+            CALL trd_trc( ztrmed(:,:,:,jn), jn, jptra_sms, kt )   ! save trends
           END DO
-          CALL wrk_dealloc( jpi, jpj, jpk, ztrmed )
+          CALL wrk_dealloc( jpi, jpj, jpk, jp_medusa, ztrmed )
       END IF