Changeset 4247


Ignore:
Timestamp:
2013-11-19T13:09:39+01:00 (8 years ago)
Author:
cetlod
Message:

dev_locean_cmcc_ingv_merc_ukmo : minor bugs corrections

Location:
branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013/NEMOGCM
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013/NEMOGCM/CONFIG/C1D_PAPA/cpp_C1D_PAPA.fcm

    r4245 r4247  
    1  bld::tool::fppkeys key_c1d key_dynspg_flt key_diahth key_zdfgls key_iomput 
     1 bld::tool::fppkeys key_c1d key_dynspg_flt key_diahth key_zdfgls key_iomput key_mpp_mpi 
  • branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013/NEMOGCM/CONFIG/cfg.txt

    r4245 r4247  
    1 GYRE OPA_SRC 
    21GYRE_BFM OPA_SRC TOP_SRC 
    32GYRE_PISCES OPA_SRC TOP_SRC 
     3ORCA2_LIM3 OPA_SRC LIM_SRC_3 NST_SRC 
     4ORCA2_LIM_CFC_C14b OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC 
     5GYRE OPA_SRC 
     6ORCA2_LIM_PISCES OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC 
     7ORCA2_OFF_PISCES OPA_SRC OFF_SRC TOP_SRC 
     8ORCA2_SAS_LIM OPA_SRC SAS_SRC LIM_SRC_2 NST_SRC 
    49AMM12 OPA_SRC 
    510ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC 
    6 ORCA2_LIM3 OPA_SRC LIM_SRC_3 NST_SRC 
    7 ORCA2_SAS_LIM OPA_SRC SAS_SRC LIM_SRC_2 NST_SRC 
    8 ORCA2_LIM_CFC_C14b OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC 
    9 ORCA2_OFF_PISCES OPA_SRC OFF_SRC TOP_SRC 
    10 ORCA2_LIM_PISCES OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC 
    1111C1D_PAPA OPA_SRC 
  • branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/C1D/c1d.F90

    r4245 r4247  
    1616   USE in_out_manager   ! I/O manager 
    1717   USE par_kind         ! kind parameters 
     18   USE lib_mpp 
    1819 
    1920   IMPLICIT NONE 
  • branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90

    r4245 r4247  
    6060 
    6161                             indic = 0                ! reset to no error condition 
    62       IF( kstp == nit000 )   CALL iom_init            ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS) 
     62      IF( kstp == nit000 )   CALL iom_init( "nemo")   ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS) 
    6363      IF( kstp /= nit000 )   CALL day( kstp )         ! Calendar (day was already called at nit000 in day_init) 
    64                              CALL iom_setkt( kstp - nit000 + 1 )   ! say to iom that we are at time step kstp 
     64                             CALL iom_setkt( kstp - nit000 + 1, "nemo" )   ! say to iom that we are at time step kstp 
    6565 
    6666      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
  • branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/CRS/crsdom.F90

    r4064 r4247  
    3535   USE crs            ! domain for coarse grid 
    3636   USE in_out_manager  
    37    USE par_kind, ONLY: wp 
     37   USE par_kind 
    3838   USE crslbclnk 
    3939    
  • branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90

    r4154 r4247  
    3030   !                                    !!* Namelist namdom : time & space domain * 
    3131   INTEGER , PUBLIC ::   nn_bathy        !: = 0/1 ,compute/read the bathymetry file 
     32   REAL(wp), PUBLIC ::   rn_bathy        !: depth of flat bottom (active if nn_bathy=0; if =0 depth=jpkm1) 
    3233   REAL(wp), PUBLIC ::   rn_hmin         !: minimum ocean depth (>0) or minimum number of ocean levels (<0) 
    3334   REAL(wp), PUBLIC ::   rn_e3zps_min    !: miminum thickness for partial steps (meters) 
  • branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/TRA/tradmp.F90

    r4245 r4247  
    4949 
    5050   !                               !!* Namelist namtra_dmp : T & S newtonian damping * 
    51    LOGICAL, PUBLIC ::   ln_tradmp   !: internal damping flag 
    52    INTEGER         ::   nn_hdmp     ! = 0/-1/'latitude' for damping over T and S 
    53    INTEGER         ::   nn_zdmp     ! = 0/1/2 flag for damping in the mixed layer 
    54    REAL(wp)        ::   rn_surf     ! surface time scale for internal damping        [days] 
    55    REAL(wp)        ::   rn_bot      ! bottom time scale for internal damping         [days] 
    56    REAL(wp)        ::   rn_dep      ! depth of transition between rn_surf and rn_bot [meters] 
    57    INTEGER         ::   nn_file     ! = 1 create a damping.coeff NetCDF file  
     51   LOGICAL , PUBLIC ::   ln_tradmp   !: internal damping flag 
     52   INTEGER , PUBLIC ::   nn_hdmp     ! = 0/-1/'latitude' for damping over T and S 
     53   INTEGER , PUBLIC ::   nn_zdmp     ! = 0/1/2 flag for damping in the mixed layer 
     54   REAL(wp), PUBLIC ::   rn_surf     ! surface time scale for internal damping        [days] 
     55   REAL(wp), PUBLIC ::   rn_bot      ! bottom time scale for internal damping         [days] 
     56   REAL(wp), PUBLIC ::   rn_dep      ! depth of transition between rn_surf and rn_bot [meters] 
     57   INTEGER , PUBLIC ::   nn_file     ! = 1 create a damping.coeff NetCDF file  
    5858 
    5959   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   strdmp   !: damping salinity trend (psu/s) 
Note: See TracChangeset for help on using the changeset viewer.