Changeset 8657 for branches/NERC/dev_r5518_GO6_COAREbulk/NEMOGCM/NEMO/TOP_SRC/trcini.F90

Timestamp:

2017-10-25T14:46:18+02:00 (7 years ago)

Author:

jpalmier

Message:

update the branch to match last GO6 changes

File:

• branches/NERC/dev_r5518_GO6_COAREbulk/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) (8 diffs)

branches/NERC/dev_r5518_GO6_COAREbulk/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -24 +24 @@
    USE trcini_pisces   ! PISCES   initialisation
    USE trcini_c14b     ! C14 bomb initialisation
+   USE trcini_age      ! AGE      initialisation
    USE trcini_my_trc   ! MY_TRC   initialisation
+   USE trcini_idtra    ! idealize tracer initialisation
    USE trcini_medusa   ! MEDUSA   initialisation
-   USE trcini_idtra    ! idealize tracer initialisation
-   USE trcini_age      ! AGE      initialisation
    USE trcdta          ! initialisation from files
    USE daymod          ! calendar manager
@@ -79 +79 @@
          &   CALL ctl_warn(' Coupling with passive tracers and used of diurnal cycle. &
          & Computation of a daily mean shortwave for some biogeochemical models) ')
-          !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-          !!!!! CHECK For MEDUSA
-          !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
       IF( nn_cla == 1 )   &
          &  CALL ctl_stop( ' Cross Land Advection not yet implemented with passive tracer ; nn_cla must be 0' )
@@ -102 +100 @@
 
       IF( lk_pisces  )       CALL trc_ini_pisces       ! PISCES  bio-model
-      IF( lk_medusa  )       CALL trc_ini_medusa       ! MEDUSA  tracers
-      IF( lk_idtra   )       CALL trc_ini_idtra        ! Idealize tracers
       IF( lk_cfc     )       CALL trc_ini_cfc          ! CFC     tracers
       IF( lk_c14b    )       CALL trc_ini_c14b         ! C14 bomb  tracer
       IF( lk_age     )       CALL trc_ini_age          ! AGE       tracer
       IF( lk_my_trc  )       CALL trc_ini_my_trc       ! MY_TRC  tracers
+      IF( lk_idtra   )       CALL trc_ini_idtra        ! Idealize tracers
+      IF( lk_medusa  )       CALL trc_ini_medusa       ! MEDUSA  tracers
 
       CALL trc_ice_ini                                 ! Tracers in sea ice
-
-# if defined key_debug_medusa
-         IF (lwp) write (numout,*) '------------------------------'
-         IF (lwp) write (numout,*) 'Jpalm - debug'
-         IF (lwp) write (numout,*) ' in trc_init'
-         IF (lwp) write (numout,*) ' sms init OK'
-         IF (lwp) write (numout,*) ' next: open tracer.stat'
-         IF (lwp) write (numout,*) ' '
-         CALL flush(numout)
-# endif
 
       IF( ln_ctl ) THEN
@@ -133 +121 @@
       ENDIF
 
-# if defined key_debug_medusa
-         IF (lwp) write (numout,*) '------------------------------'
-         IF (lwp) write (numout,*) 'Jpalm - debug'
-         IF (lwp) write (numout,*) ' in trc_init'
-         IF (lwp) write (numout,*) 'open tracer.stat -- OK'
-         IF (lwp) write (numout,*) ' '
-         CALL flush(numout)
-# endif
-
-
       IF( ln_trcdta ) THEN
-#if defined key_medusa
-         IF(lwp) WRITE(numout,*) 'AXY: calling trc_dta_init'
-         IF(lwp) CALL flush(numout)
-#endif
          CALL trc_dta_init(jptra)
       ENDIF
@@ -153 +127 @@
       IF( ln_rsttr ) THEN
         !
-#if defined key_medusa
-        IF(lwp) WRITE(numout,*) 'AXY: calling trc_rst_read'
-        IF(lwp) CALL flush(numout)
-#endif
         CALL trc_rst_read              ! restart from a file
         !
       ELSE
-        !
-# if defined key_debug_medusa
-         IF (lwp) write (numout,*) '------------------------------'
-         IF (lwp) write (numout,*) 'Jpalm - debug'
-         IF (lwp) write (numout,*) ' Init from file -- will call trc_dta'
-         IF (lwp) write (numout,*) ' '
-         CALL flush(numout)
-# endif
         !
         IF( ln_trcdta .AND. nb_trcdta > 0 ) THEN  ! Initialisation of tracer from a file that may also be used for damping
@@ -188 +150 @@
         ENDIF
         !
-# if defined key_debug_medusa
-         IF (lwp) write (numout,*) '------------------------------'
-         IF (lwp) write (numout,*) 'Jpalm - debug'
-         IF (lwp) write (numout,*) ' in trc_init'
-         IF (lwp) write (numout,*) ' before trb = trn'
-         IF (lwp) write (numout,*) ' '
-         CALL flush(numout)
-# endif
-        !
         trb(:,:,:,:) = trn(:,:,:,:)
         ! 
-# if defined key_debug_medusa
-         IF (lwp) write (numout,*) '------------------------------'
-         IF (lwp) write (numout,*) 'Jpalm - debug'
-         IF (lwp) write (numout,*) ' in trc_init'
-         IF (lwp) write (numout,*) ' trb = trn -- OK'
-         IF (lwp) write (numout,*) ' '
-         CALL flush(numout)
-# endif
-        ! 
       ENDIF
  
       tra(:,:,:,:) = 0._wp
       !
-# if defined key_debug_medusa
-         IF (lwp) write (numout,*) '------------------------------'
-         IF (lwp) write (numout,*) 'Jpalm - debug'
-         IF (lwp) write (numout,*) ' in trc_init'
-         IF (lwp) write (numout,*) ' partial step -- OK'
-         IF (lwp) write (numout,*) ' '
-         CALL flush(numout)
-# endif
-      !
       IF( nn_dttrc /= 1 )        CALL trc_sub_ini      ! Initialize variables for substepping passive tracers
       !
-# if defined key_debug_medusa
-         IF (lwp) write (numout,*) '------------------------------'
-         IF (lwp) write (numout,*) 'Jpalm - debug'
-         IF (lwp) write (numout,*) ' in trc_init'
-         IF (lwp) write (numout,*) ' before initiate tracer contents'
-         IF (lwp) write (numout,*) ' '
-         CALL flush(numout)
-# endif
-      !
+
       trai(:) = 0._wp                                                   ! initial content of all tracers
       DO jn = 1, jptra
@@ -295 +222 @@
       USE trdmxl_trc    , ONLY:   trd_mxl_trc_alloc
 #endif
+# if defined key_medusa
+      USE bio_medusa_mod, ONLY:   bio_medusa_alloc
+# endif
+
       !
       INTEGER :: ierr
@@ -307 +238 @@
       ierr = ierr + trd_mxl_trc_alloc()
 #endif
+#if defined key_medusa
+      ierr = ierr + bio_medusa_alloc()
+#endif
       !
       IF( lk_mpp    )   CALL mpp_sum( ierr )