Changeset 13489 for branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1_v2/NEMOGCM/NEMO/TOP_SRC/FABM/par_fabm.F90

Timestamp:

2020-09-17T19:13:57+02:00 (4 years ago)

Author:

dford

Message:

Merge in previous branch.

File:

• branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1_v2/NEMOGCM/NEMO/TOP_SRC/FABM/par_fabm.F90 (modified) (2 diffs)

branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1_v2/NEMOGCM/NEMO/TOP_SRC/FABM/par_fabm.F90

@@ -1 +1 @@
 MODULE par_fabm
 
+#if defined key_fabm
+#  include "fabm_version.h"
+#  if _FABM_API_VERSION_ < 1
+#    error You need FABM 1.0 or later
+#  endif
    USE fabm
+#endif
 
    IMPLICIT NONE
-
-   TYPE (type_model) :: model !FABM model instance
 
    INTEGER, PUBLIC :: jp_fabm0, jp_fabm1, jp_fabm, &
@@ -35 +39 @@
                       jp_fabm_r8c,   jp_fabm_r8p,  &
                       jp_fabm_r8s,   jp_fabm_xeps, &
+                      jp_fabm_swr,                 &
                       jp_fabm_pgrow, jp_fabm_ploss
 
+   LOGICAL, PUBLIC, ALLOCATABLE, DIMENSION(:) ::   lk_rad_fabm !: FABM negativity correction flag array
+
 #if defined key_fabm
+   CLASS (type_fabm_model), POINTER :: model !FABM model instance
+
    !!---------------------------------------------------------------------
    !!   'key_fabm'                     FABM tracers
    !!---------------------------------------------------------------------
    LOGICAL, PUBLIC, PARAMETER ::   lk_fabm     = .TRUE.   !: FABM flag 
-   LOGICAL, PUBLIC, ALLOCATABLE, DIMENSION(:) ::   lk_rad_fabm !: FABM negativity correction flag array 
 #else
    !!---------------------------------------------------------------------