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

Timestamp:

2017-08-24T19:05:09+02:00 (7 years ago)

Author:

jpalmier

Message:

JPALM - trdtrc - fixes, update field_def

Location:

branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC

Files:

• CFC/trcsms_cfc.F90 (modified) (3 diffs)
• MEDUSA/bio_medusa_update.F90 (modified) (5 diffs)
• MEDUSA/trcsms_medusa.F90 (modified) (3 diffs)
• trcnam.F90 (modified) (1 diff)

branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90

@@ -24 +24 @@
    USE trdtrc
    USE iom           ! I/O library
+   USE wrk_nemo
 
    IMPLICIT NONE
@@ -54 +55 @@
    REAL(wp) ::   xconv3 = 1.0e+3       ! conversion from mol/l/atm to mol/m3/atm
    REAL(wp) ::   xconv4 = 1.0e-12      ! conversion from mol/m3/atm to mol/m3/pptv 
+
+   !! trend temporary array:
+   REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrcfc
 
    !! * Substitutions
@@ -265 +269 @@
       !
       IF( l_trdtrc ) THEN
+          CALL wrk_alloc( jpi, jpj, jpk, ztrcfc )
           DO jn = jp_cfc0, jp_cfc1
-            CALL trd_trc( tra(:,:,:,jn), jn, jptra_sms, kt )   ! save trends
+             ztrcfc(:,:,:) = tra(:,:,:,jn)
+            CALL trd_trc( ztrcfc, jn, jptra_sms, kt )   ! save trends
           END DO
+          CALL wrk_dealloc( jpi, jpj, jpk, ztrcfc )
       END IF
       !

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

@@ -70 +70 @@
       USE lib_mpp,           ONLY: ctl_stop
       USE par_kind,          ONLY: wp
-      USE par_medusa,        ONLY: jp_medusa,                                &
+      USE par_medusa,        ONLY: jp_medusa, jp_msa0, jp_msa1,              &
                                    jpalk, jpchd, jpchn, jpdet, jpdic,        &
                                    jpdin, jpdtc, jpfer, jpoxy, jppds,        &
@@ -78 +78 @@
                                    jpoxy_lc, jppds_lc, jpphd_lc, jpphn_lc,   &
                                    jpsil_lc, jpzme_lc, jpzmi_lc
-      USE par_oce,           ONLY: jpi, jpim1, jpj, jpjm1
+      USE par_oce,           ONLY: jpi, jpim1, jpj, jpjm1, jpk
       USE par_trc,           ONLY: jptra
       USE sms_medusa,        ONLY: friver_dep,                               &
@@ -91 +91 @@
                                    xxi
       USE trc,               ONLY: med_diag, tra
-      USE trd_oce,           ONLY: jptra_sms 
-      USE trdtrc
 
    !!* Substitution
@@ -121 +119 @@
       !! temporary variables
       REAL(wp) :: fq0
-
-      !! trend temporary array:
-      REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrmed
 
       !!==========================================================
@@ -739 +734 @@
       ENDDO
 
-      !! 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
-          END DO
-          CALL wrk_dealloc( jpi, jpj, jpk, ztrmed )
-      END IF
-
       DO jj = 2,jpjm1
          DO ji = 2,jpim1

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

@@ -22 +22 @@
    USE trcsed_medusa
    USE trcavg_medusa
+   !! for SMS trends
+   USE par_medusa,    ONLY: jp_msa0, jp_msa1
+   USE par_oce,       ONLY: jpi, jpj, jpk
+   USE trd_oce,       ONLY: jptra_sms, l_trdtrc
+   USE trdtrc
 
 
@@ -46 +51 @@
       !!----------------------------------------------------------------------
       INTEGER, INTENT(in) :: kt   ! ocean time-step index
+      !! Loop variables
+      INTEGER :: jn
+      !! trend temporary array:
+      REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrmed
+
 
 # if defined key_debug_medusa
@@ -95 +105 @@
 # endif
 
+      !! 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
+          END DO
+          CALL wrk_dealloc( jpi, jpj, jpk, ztrmed )
+      END IF
+
+
    END SUBROUTINE trc_sms_medusa
    

branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/trcnam.F90

@@ -79 +79 @@
       
       !                                        !   Parameters of additional diagnostics
-      IF( .NOT. lk_offline ) CALL trc_nam_dia
+      IF( .NOT. lk_iomput )  CALL trc_nam_dia
 
       !                                        !   namelist of transport