Changeset 10158


Ignore:
Timestamp:
2018-09-25T16:49:52+02:00 (22 months ago)
Author:
dford
Message:

Minor changes to compile and run at the Met Office.

Location:
branches/UKMO/AMM15_v3_6_STABLE_package_FABM/NEMOGCM/NEMO
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/AMM15_v3_6_STABLE_package_FABM/NEMOGCM/NEMO/OPA_SRC/IOM/iom_def.F90

    r8058 r10158  
    4343   INTEGER, PARAMETER, PUBLIC ::   jp_i1    = 204      !: write INTEGER(1) 
    4444 
    45    INTEGER, PARAMETER, PUBLIC ::   jpmax_files  = 100   !: maximum number of simultaneously opened file 
     45   INTEGER, PARAMETER, PUBLIC ::   jpmax_files  = 200   !: maximum number of simultaneously opened file 
    4646   INTEGER, PARAMETER, PUBLIC ::   jpmax_vars   = 600  !: maximum number of variables in one file 
    4747   INTEGER, PARAMETER, PUBLIC ::   jpmax_dims   =  4   !: maximum number of dimensions for one variable 
  • branches/UKMO/AMM15_v3_6_STABLE_package_FABM/NEMOGCM/NEMO/TOP_SRC/FABM/inputs_fabm.F90

    r10156 r10158  
    3030   PUBLIC trc_rnf_fabm 
    3131 
    32    #if defined key_trdtrc && defined key_iomput 
    33       REAL(wp), PUBLIC, ALLOCATABLE, SAVE, TARGET, DIMENSION(:,:,:) :: tr_inp 
    34    #endif 
     32#if defined key_trdtrc && defined key_iomput 
     33   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, TARGET, DIMENSION(:,:,:) :: tr_inp 
     34#endif 
    3535 
    3636   TYPE, PUBLIC :: type_input_variable 
  • branches/UKMO/AMM15_v3_6_STABLE_package_FABM/NEMOGCM/NEMO/TOP_SRC/FABM/trcini_fabm.F90

    r10156 r10158  
    3333 
    3434#if defined key_git_version 
    35 #include "gitversion.h90" 
     35!#include "gitversion.h90" 
    3636   CHARACTER(len=*),parameter :: git_commit_id = _NEMO_COMMIT_ID_ 
    3737   CHARACTER(len=*),parameter :: git_branch_name = _NEMO_BRANCH_ 
     
    201201      CASE (3) 
    202202        DO i=1,size(trd_tags) 
    203          WRITE (xml_unit,'(A)') '  <field id="'//TRIM(trd_tags(i))//'_'//TRIM(variable%name)//'" long_name="'//TRIM(variable%long_name)//' '//TRIM(trd_tags(i))//' trend" unit="'//TRIM(variable%units)//'/s" default_value="'//TRIM(ADJUSTL(missing_value))//'" grid_ref="grid_T_3D" />' 
     203         WRITE (xml_unit,'(A)') '  <field id="'//TRIM(trd_tags(i))//'_'//TRIM(variable%name)//'" long_name="'// & 
     204            &                   TRIM(variable%long_name)//' '//TRIM(trd_tags(i))//' trend" unit="'//            & 
     205            &                   TRIM(variable%units)//'/s" default_value="'//                                   & 
     206            &                   TRIM(ADJUSTL(missing_value))//'" grid_ref="grid_T_3D" />' 
    204207        END DO 
    205208#if defined key_tracer_budget 
    206209        DO i=1,size(trd_e3t_tags) 
    207          WRITE (xml_unit,'(A)') '  <field id="'//TRIM(trd_e3t_tags(i))//'_'//TRIM(variable%name)//'_e3t" long_name="'//TRIM(variable%long_name)//' cell depth integrated '//TRIM(trd_e3t_tags(i))//' trend" unit="'//TRIM(variable%units)//'/s" default_value="'//TRIM(ADJUSTL(missing_value))//'" grid_ref="grid_T_3D" />' 
     210         WRITE (xml_unit,'(A)') '  <field id="'//TRIM(trd_e3t_tags(i))//'_'//TRIM(variable%name)//                     & 
     211            &                   '_e3t" long_name="'//TRIM(variable%long_name)//' cell depth integrated '//             & 
     212            &                   TRIM(trd_e3t_tags(i))//' trend" unit="'//TRIM(variable%units)//'/s" default_value="'// & 
     213            &                   TRIM(ADJUSTL(missing_value))//'" grid_ref="grid_T_3D" />' 
    208214        END DO 
    209         WRITE (xml_unit,'(A)') '  <field id="'//TRIM(variable%name)//'_e3t" long_name="'//TRIM(variable%long_name)//' cell depth integrated" unit="'//TRIM(variable%units)//'/s" default_value="'//TRIM(ADJUSTL(missing_value))//'" grid_ref="grid_T_3D" />' 
     215        WRITE (xml_unit,'(A)') '  <field id="'//TRIM(variable%name)//'_e3t" long_name="'//TRIM(variable%long_name)// & 
     216           &                   ' cell depth integrated" unit="'//TRIM(variable%units)//'/s" default_value="'//       & 
     217           &                   TRIM(ADJUSTL(missing_value))//'" grid_ref="grid_T_3D" />' 
    210218#endif 
    211219      CASE (-1) 
    212220        DO i=1,size(trd_tags) 
    213          WRITE (xml_unit,'(A)') '  <field id="'//TRIM(trd_tags(i))//'_'//TRIM(variable%name)//'" long_name="'//TRIM(variable%long_name)//' '//TRIM(trd_tags(i))//' trend" unit="'//TRIM(variable%units)//'/s" default_value="'//TRIM(ADJUSTL(missing_value))//'" />' 
     221         WRITE (xml_unit,'(A)') '  <field id="'//TRIM(trd_tags(i))//'_'//TRIM(variable%name)//'" long_name="'//   & 
     222            &                   TRIM(variable%long_name)//' '//TRIM(trd_tags(i))//' trend" unit="'//              & 
     223            &                   TRIM(variable%units)//'/s" default_value="'//TRIM(ADJUSTL(missing_value))//'" />' 
    214224        END DO 
    215225#if defined key_tracer_budget 
    216226        DO i=1,size(trd_e3t_tags) 
    217          WRITE (xml_unit,'(A)') '  <field id="'//TRIM(trd_e3t_tags(i))//'_'//TRIM(variable%name)//'_e3t" long_name="'//TRIM(variable%long_name)//' cell depth integrated '//TRIM(trd_e3t_tags(i))//' trend" unit="'//TRIM(variable%units)//'/s" default_value="'//TRIM(ADJUSTL(missing_value))//'" />' 
     227         WRITE (xml_unit,'(A)') '  <field id="'//TRIM(trd_e3t_tags(i))//'_'//TRIM(variable%name)//                     & 
     228            &                   '_e3t" long_name="'//TRIM(variable%long_name)//' cell depth integrated '//             & 
     229            &                   TRIM(trd_e3t_tags(i))//' trend" unit="'//TRIM(variable%units)//'/s" default_value="'// & 
     230            &                   TRIM(ADJUSTL(missing_value))//'" />' 
    218231        END DO 
    219         WRITE (xml_unit,'(A)') '  <field id="'//TRIM(variable%name)//'_e3t" long_name="'//TRIM(variable%long_name)//' cell depth integrated" unit="'//TRIM(variable%units)//'/s" default_value="'//TRIM(ADJUSTL(missing_value))//'" />' 
     232        WRITE (xml_unit,'(A)') '  <field id="'//TRIM(variable%name)//'_e3t" long_name="'//TRIM(variable%long_name)// & 
     233           &                   ' cell depth integrated" unit="'//TRIM(variable%units)//'/s" default_value="'//       & 
     234           &                   TRIM(ADJUSTL(missing_value))//'" />' 
    220235#endif 
    221236      CASE default 
    222          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!!!' 
     237         IF(lwp) WRITE(numout,*) ' trc_ini_fabm: Failing to initialise trends of variable '//TRIM(variable%name)// & 
     238            &                    ': Output of '//TRIM(ADJUSTL(string_dimensions))//'-dimensional trends not supported!!!' 
    223239      END SELECT 
    224240 
Note: See TracChangeset for help on using the changeset viewer.