Index: /branches/UKMO/AMM15_v3_6_STABLE_package_FABM/NEMOGCM/NEMO/OPA_SRC/IOM/iom_def.F90
===================================================================
--- /branches/UKMO/AMM15_v3_6_STABLE_package_FABM/NEMOGCM/NEMO/OPA_SRC/IOM/iom_def.F90 (revision 10157)
+++ /branches/UKMO/AMM15_v3_6_STABLE_package_FABM/NEMOGCM/NEMO/OPA_SRC/IOM/iom_def.F90 (revision 10158)
@@ -43,5 +43,5 @@
INTEGER, PARAMETER, PUBLIC :: jp_i1 = 204 !: write INTEGER(1)
- INTEGER, PARAMETER, PUBLIC :: jpmax_files = 100 !: maximum number of simultaneously opened file
+ INTEGER, PARAMETER, PUBLIC :: jpmax_files = 200 !: maximum number of simultaneously opened file
INTEGER, PARAMETER, PUBLIC :: jpmax_vars = 600 !: maximum number of variables in one file
INTEGER, PARAMETER, PUBLIC :: jpmax_dims = 4 !: maximum number of dimensions for one variable
Index: /branches/UKMO/AMM15_v3_6_STABLE_package_FABM/NEMOGCM/NEMO/TOP_SRC/FABM/inputs_fabm.F90
===================================================================
--- /branches/UKMO/AMM15_v3_6_STABLE_package_FABM/NEMOGCM/NEMO/TOP_SRC/FABM/inputs_fabm.F90 (revision 10157)
+++ /branches/UKMO/AMM15_v3_6_STABLE_package_FABM/NEMOGCM/NEMO/TOP_SRC/FABM/inputs_fabm.F90 (revision 10158)
@@ -30,7 +30,7 @@
PUBLIC trc_rnf_fabm
- #if defined key_trdtrc && defined key_iomput
- REAL(wp), PUBLIC, ALLOCATABLE, SAVE, TARGET, DIMENSION(:,:,:) :: tr_inp
- #endif
+#if defined key_trdtrc && defined key_iomput
+ REAL(wp), PUBLIC, ALLOCATABLE, SAVE, TARGET, DIMENSION(:,:,:) :: tr_inp
+#endif
TYPE, PUBLIC :: type_input_variable
Index: /branches/UKMO/AMM15_v3_6_STABLE_package_FABM/NEMOGCM/NEMO/TOP_SRC/FABM/trcini_fabm.F90
===================================================================
--- /branches/UKMO/AMM15_v3_6_STABLE_package_FABM/NEMOGCM/NEMO/TOP_SRC/FABM/trcini_fabm.F90 (revision 10157)
+++ /branches/UKMO/AMM15_v3_6_STABLE_package_FABM/NEMOGCM/NEMO/TOP_SRC/FABM/trcini_fabm.F90 (revision 10158)
@@ -33,5 +33,5 @@
#if defined key_git_version
-#include "gitversion.h90"
+!#include "gitversion.h90"
CHARACTER(len=*),parameter :: git_commit_id = _NEMO_COMMIT_ID_
CHARACTER(len=*),parameter :: git_branch_name = _NEMO_BRANCH_
@@ -201,24 +201,40 @@
CASE (3)
DO i=1,size(trd_tags)
- WRITE (xml_unit,'(A)') ' '
+ WRITE (xml_unit,'(A)') ' '
END DO
#if defined key_tracer_budget
DO i=1,size(trd_e3t_tags)
- WRITE (xml_unit,'(A)') ' '
+ WRITE (xml_unit,'(A)') ' '
END DO
- WRITE (xml_unit,'(A)') ' '
+ WRITE (xml_unit,'(A)') ' '
#endif
CASE (-1)
DO i=1,size(trd_tags)
- WRITE (xml_unit,'(A)') ' '
+ WRITE (xml_unit,'(A)') ' '
END DO
#if defined key_tracer_budget
DO i=1,size(trd_e3t_tags)
- WRITE (xml_unit,'(A)') ' '
+ WRITE (xml_unit,'(A)') ' '
END DO
- WRITE (xml_unit,'(A)') ' '
+ WRITE (xml_unit,'(A)') ' '
#endif
CASE default
- IF(lwp) WRITE(numout,*) ' trc_ini_fabm: Failing to initialise trends of variable '//TRIM(variable%name)//': Output of '//TRIM(ADJUSTL(string_dimensions))//'-dimensional trends not supported!!!'
+ IF(lwp) WRITE(numout,*) ' trc_ini_fabm: Failing to initialise trends of variable '//TRIM(variable%name)// &
+ & ': Output of '//TRIM(ADJUSTL(string_dimensions))//'-dimensional trends not supported!!!'
END SELECT