Changeset 13241 for branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1/NEMOGCM/NEMO/TOP_SRC/trcnam.F90

Timestamp:

2020-07-03T14:42:49+02:00 (4 years ago)

Author:

dford

Message:

Update NEMO-FABM coupler for compatability with FABM v1.0.

File:

• branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) (4 diffs)

branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1/NEMOGCM/NEMO/TOP_SRC/trcnam.F90

@@ -325 +325 @@
       sn_tracer(:)%llcbc = .FALSE.
       sn_tracer(:)%llcbc = .FALSE.
+      sn_tracer(:)%clsname = 'NONAME'
 #endif
 
@@ -335 +336 @@
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtrc in configuration namelist', lwp )
       IF(lwm) WRITE ( numont, namtrc )
+
+      ! +++>>> FABM
+      if (lk_fabm) CALL trc_nam_fabm_override(sn_tracer)
+      ! FABM <<<+++
 
       DO jn = 1, jptra
@@ -354 +359 @@
       END DO
      
-      ! +++>>> FABM
-      if (lk_fabm) CALL trc_nam_fabm_override
-      ! FABM <<<+++
     END SUBROUTINE trc_nam_trc
 
@@ -380 +382 @@
       INTEGER  ::   ios                 ! Local integer output status for namelist read
       !!---------------------------------------------------------------------
-
-      IF(lwp) WRITE(numout,*) 
-      IF(lwp) WRITE(numout,*) 'trc_nam_dia : read the passive tracer diagnostics options'
-      IF(lwp) WRITE(numout,*) '~~~~~~~'
 
       IF(lwp) WRITE(numout,*)