Changeset 11038


Ignore:
Timestamp:
2019-05-22T22:44:28+02:00 (16 months ago)
Author:
rrenshaw
Message:

code fixes

Location:
branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis2/NEMOGCM/NEMO/OPA_SRC
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis2/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90

    r10974 r11038  
    7575 
    7676  !! * Module variables 
    77   INTEGER :: nn_dct        ! Frequency of computation 
    78   INTEGER :: nn_dctwri     ! Frequency of output 
    79   INTEGER :: nn_secdebug   ! Number of the section to debug 
    80   INTEGER :: nn_dct_h      ! Frequency of computation for NOOS hourly files 
    81   INTEGER :: nn_dctwri_h   ! Frequency of output for NOOS hourly files 
     77  INTEGER :: nn_dct      = 1     ! Frequency of computation 
     78  INTEGER :: nn_dctwri   = 1     ! Frequency of output 
     79  INTEGER :: nn_secdebug = 0     ! Number of the section to debug 
     80  INTEGER :: nn_dct_h    = 1     ! Frequency of computation for NOOS hourly files 
     81  INTEGER :: nn_dctwri_h = 1     ! Frequency of output for NOOS hourly files 
    8282    
    8383  INTEGER, PARAMETER :: nb_class_max  = 12   ! maximum number of classes, i.e. depth levels or density classes 
     
    209209        IF( ln_NOOS ) THEN 
    210210           WRITE(numout,*) "       Calculate NOOS hourly output: ln_dct_calc_noos_hr = ",ln_dct_calc_noos_hr 
    211            WRITE(numout,*) "       Calculate NOOS 25 hour mean output: ln_dct_calc_noos_hr = ",ln_dct_calc_noos_25h 
     211           WRITE(numout,*) "       Calculate NOOS 25 hour mean output: ln_dct_calc_noos_25h = ",ln_dct_calc_noos_25h 
    212212           WRITE(numout,*) "       Use IOM Output: ln_dct_iom_cont = ",ln_dct_iom_cont 
    213213           WRITE(numout,*) "       Output in ASCII (True) or Binary (False): ln_dct_ascii = ",ln_dct_ascii 
     
    254254           ENDIF 
    255255        ELSE 
    256            CALL ctl_opn( numdct_vol,  'volume_transport', 'NEW', 'FORMATTED', 'SEQUENTIAL', -1, numout,  .FALSE. ) 
    257            CALL ctl_opn( numdct_heat, 'heat_transport'  , 'NEW', 'FORMATTED', 'SEQUENTIAL', -1, numout,  .FALSE. ) 
    258            CALL ctl_opn( numdct_salt, 'salt_transport'  , 'NEW', 'FORMATTED', 'SEQUENTIAL', -1, numout,  .FALSE. ) 
     256           CALL ctl_opn( numdct_vol,  'volume_transport', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout,  .FALSE. ) 
     257           CALL ctl_opn( numdct_heat, 'heat_transport'  , 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout,  .FALSE. ) 
     258           CALL ctl_opn( numdct_salt, 'salt_transport'  , 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout,  .FALSE. ) 
    259259        ENDIF 
    260260     ENDIF 
     
    559559     CALL wrk_alloc( nb_point_max, directemp ) 
    560560 
     561! --------------------------------------------------------------------------------------------- 
     562! This section seems to be needed, else later reads find no sections in section_ijglobal.diadct 
    561563     !open input file 
    562564     !--------------- 
     
    575577     READ(107) isec 
    576578     CLOSE(107) 
     579! --------------------------------------------------------------------------------------------- 
    577580      
    578581     CALL ctl_opn( numdct_in, 'section_ijglobal.diadct', 'OLD', 'UNFORMATTED', 'SEQUENTIAL', -1, numout, .TRUE. ) 
  • branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis2/NEMOGCM/NEMO/OPA_SRC/DIA/diapea.F90

    r10958 r11038  
    5959          WRITE(numout,*) '~~~~~~~~~~~~' 
    6060          WRITE(numout,*) 'Namelist nam_pea : set pea output ' 
    61           WRITE(numout,*) 'Switch for pea diagnostics (T) or not (F)  ln_diaregmean  = ', ln_pea 
     61          WRITE(numout,*) 'Switch for pea diagnostics (T) or not (F)  ln_pea  = ', ln_pea 
    6262      ENDIF 
    6363       
  • branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis2/NEMOGCM/NEMO/OPA_SRC/DIA/diaregmean.F90

    r10974 r11038  
    9393      INTEGER               ::   BGC_nlevs,nBGC_output, bgci 
    9494      CHARACTER(len = 10), ALLOCATABLE, DIMENSION(:)       ::   BGC_stat_name(:),BGC_lev_name(:),BGC_output_var(:) 
    95 #endif 
    96  
    9795      ! 
    9896      NAMELIST/nam_diaregmean/ ln_diaregmean,ln_diaregmean_ascii,ln_diaregmean_bin,ln_diaregmean_nc,& 
    9997        & ln_diaregmean_karamld, ln_diaregmean_pea,ln_diaregmean_diaar5,ln_diaregmean_diasbc,ln_diaregmean_bgc 
     98      ln_diaregmean_bgc     = .FALSE.  ! don't write biogeochemistry regional means 
     99#else 
     100      NAMELIST/nam_diaregmean/ ln_diaregmean,ln_diaregmean_ascii,ln_diaregmean_bin,ln_diaregmean_nc,& 
     101        & ln_diaregmean_karamld, ln_diaregmean_pea,ln_diaregmean_diaar5,ln_diaregmean_diasbc 
     102#endif 
    100103       
    101104       
     
    105108      ! Defaults are generally negative, regional means output switched off 
    106109      ln_diaregmean         = .FALSE.  ! don't write regional means 
    107       ln_diaregmean_bgc     = .FALSE.  ! don't write biogeochemistry regional means 
    108110      ln_diaregmean_karamld = .FALSE.  ! don't write mixed layer depth 
    109111      ln_diaregmean_pea     = .FALSE.  ! don't write potential energy anomaly 
     
    133135          WRITE(numout,*) 'Switch for regmean AR5 SLR terms (T) or not (F)  ln_diaregmean_diaar5  = ', ln_diaregmean_diaar5 
    134136          WRITE(numout,*) 'Switch for regmean Surface forcing terms (T) or not (F)  ln_diaregmean_diasbc  = ', ln_diaregmean_diasbc 
    135           WRITE(numout,*) 'Switch for regmean BioGeoChemistry terms (T) or not (F)  ln_diaregmean_bgc  = ', ln_diaregmean_bgc 
     137!         WRITE(numout,*) 'Switch for regmean BioGeoChemistry terms (T) or not (F)  ln_diaregmean_bgc  = ', ln_diaregmean_bgc 
    136138      ENDIF 
    137139       
     
    275277          idmaskvar = iom_varid( inum, 'mask', kdimsz=zdimsz, kndims=zndims, ldstop = .FALSE.)           
    276278          nmasks = zdimsz(3) 
     279!         IF(lwp) WRITE(numout,*) 'dia_regmean found this many sets of regions : ', nmasks 
    277280           
    278281          ! read in the region mask (which contains floating point numbers) into a temporary array of reals. 
     
    972975 
    973976          IF(lwp .AND. verbose) WRITE(numout,*) 'dia_regmean deallocated arrays for ',kt,maskno 
    974           IF(lwp)CALL FLUSH(numdct_reg_txt) 
     977          IF(lwp .AND. ln_diaregmean_ascii) CALL FLUSH(numdct_reg_txt) 
    975978          IF(lwp .AND. verbose) WRITE(numout,*) 'dia_regmean flushed region mean text for ',kt,maskno 
    976979      END DO 
  • branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis2/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

    r10959 r11038  
    319319      CALL iom_set_axis_attr( "region", (/ (REAL(ji,wp), ji=1,n_regions_output) /) ) 
    320320 
    321       CALL iom_set_axis_attr( "noos", (/ (REAL(ji,wp), ji=1,3) /) ) 
     321!     CALL iom_set_axis_attr( "noos", (/ (REAL(ji,wp), ji=1,3) /) ) 
    322322 
    323323       
  • branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis2/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

    r10981 r11038  
    37933793            CALL flush(kout) 
    37943794         ENDIF 
    3795          STOP 'ctl_opn bad opening' 
     3795         STOP 'ctl_opn bad opening '//clfile 
    37963796      ENDIF 
    37973797 
  • branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis2/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

    r10728 r11038  
    493493      IF(lwp) WRITE(numout,*) 'Euler time step switch is ', neuler 
    494494                            CALL dia_tmb_init  ! TMB outputs 
     495                            CALL dia_regmean_init  ! TMB outputs 
     496                            CALL dia_pea_init  ! TMB outputs 
    495497                            CALL dia_25h_init  ! 25h mean  outputs 
    496498                            CALL dia_diaopfoam_init  ! FOAM operational output 
     
    630632      IF( numdct_heat     /= -1 )   CLOSE( numdct_heat     )   ! heat transports 
    631633      IF( numdct_salt     /= -1 )   CLOSE( numdct_salt     )   ! salt transports 
     634      IF( numdct_NOOS     /= -1 )   CLOSE( numdct_NOOS     )   ! NOOS transports 
    632635 
    633636      ! 
Note: See TracChangeset for help on using the changeset viewer.