Changeset 4945 for branches/2014/dev_r4879_UKMO_NOC_MERGE
- Timestamp:
- 2014-12-02T10:07:33+01:00 (9 years ago)
- Location:
- branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM
- Files:
-
- 5 edited
-
CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg (modified) (2 diffs)
-
CONFIG/ORCA2_LIM3/EXP00/1_namelist_cfg (modified) (3 diffs)
-
NEMO/OPA_SRC/DIA/diahsb.F90 (modified) (1 diff)
-
NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) (1 diff)
-
NEMO/OPA_SRC/SBC/sbcisf.F90 (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg
r4940 r4945 79 79 ! =2 annual global mean of e-p-r set to zero 80 80 ! =3 global emp set to zero and spread out over erp area 81 / 81 82 !----------------------------------------------------------------------- 82 83 &namsbc_core ! namsbc_core CORE bulk formulae … … 107 108 &namtra_qsr ! penetrative solar radiation 108 109 !----------------------------------------------------------------------- 110 ! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ ! weights ! rotation ! 111 ! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! 112 sn_chl ='chlorophyll', -1 , 'CHLA' , .true. , .true. , 'yearly' , 'weights_bilin.nc' , '' 109 113 / 110 114 !----------------------------------------------------------------------- -
branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/1_namelist_cfg
r4940 r4945 55 55 / 56 56 !----------------------------------------------------------------------- 57 &namsplit ! time splitting parameters ("key_dynspg_ts") 58 !----------------------------------------------------------------------- 59 / 60 !----------------------------------------------------------------------- 61 &namcrs ! Grid coarsening for dynamics output and/or 62 ! passive tracer coarsened online simulations 63 !----------------------------------------------------------------------- 64 / 65 !----------------------------------------------------------------------- 57 66 &namtsd ! data : Temperature & Salinity 58 67 !----------------------------------------------------------------------- … … 85 94 sn_snow = 'ncar_precip.15JUNE2009_fill' , -1 , 'SNOW' , .false. , .true. , 'yearly' , 'weights_core2_agrif_bilinear.nc' , '' , '' 86 95 sn_tdif = 'taudif_core' , 24 , 'taudif' , .false. , .true. , 'yearly' , 'weights_core2_agrif_bilinear.nc' , '' , '' 87 88 96 cn_dir = './' ! root directory for the location of the bulk files 89 97 ln_2m = .false. ! air temperature and humidity referenced at 2m (T) instead 10m (F) … … 213 221 !----------------------------------------------------------------------- 214 222 / 223 !----------------------------------------------------------------------- 224 &namobs ! observation usage ('key_diaobs') 225 !----------------------------------------------------------------------- 226 / 227 !----------------------------------------------------------------------- 228 &nam_asminc ! assimilation increments ('key_asminc') 229 !----------------------------------------------------------------------- 230 / -
branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/NEMO/OPA_SRC/DIA/diahsb.F90
r4724 r4945 96 96 ! Add geothermal ice shelf 97 97 IF( nn_isf .GE. 1 ) THEN 98 z_frc_trd_t = z_frc_trd_t + glob_sum( ( risf_tsc(:,:,jp_tem) - rdivisf * fwfisf(:,:) * -1.9 * r1_rau0 ) * surf(:,:) ) 98 z_frc_trd_t = z_frc_trd_t + & 99 & glob_sum( ( risf_tsc(:,:,jp_tem) - rdivisf * fwfisf(:,:) * (-1.9_wp) * r1_rau0 ) * surf(:,:) ) 99 100 z_frc_trd_s = z_frc_trd_s + (1.0_wp - rdivisf) * glob_sum( risf_tsc(:,:,jp_sal) * surf(:,:) ) 100 101 ENDIF -
branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90
r4624 r4945 111 111 INTEGER :: numstp = -1 !: logical unit for time step 112 112 INTEGER :: numtime = -1 !: logical unit for timing 113 INTEGER :: numout = 6 !: logical unit for output print 113 INTEGER :: numout = 6 !: logical unit for output print; Set to stdout to ensure any early 114 ! output can be collected; do not change 114 115 INTEGER :: numnam_ref = -1 !: logical unit for reference namelist 115 116 INTEGER :: numnam_cfg = -1 !: logical unit for configuration specific namelist 116 INTEGER :: numond = 7!: logical unit for Output Namelist Dynamics117 INTEGER :: numond = -1 !: logical unit for Output Namelist Dynamics 117 118 INTEGER :: numnam_ice_ref = -1 !: logical unit for ice reference namelist 118 119 INTEGER :: numnam_ice_cfg = -1 !: logical unit for ice reference namelist 119 INTEGER :: numoni = 8!: logical unit for Output Namelist Ice120 INTEGER :: numoni = -1 !: logical unit for Output Namelist Ice 120 121 INTEGER :: numevo_ice = -1 !: logical unit for ice variables (temp. evolution) 121 122 INTEGER :: numsol = -1 !: logical unit for solver statistics -
branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90
r4938 r4945 54 54 REAL(wp) , PUBLIC, ALLOCATABLE, SAVE, DIMENSION (:,:) :: risfLeff !:effective length (Leff) BG03 nn_isf==2 55 55 REAL(wp) , PUBLIC, ALLOCATABLE, SAVE, DIMENSION (:,:) :: ttbl, stbl, utbl, vtbl !:top boundary layer variable at T point 56 INTEGER(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION (:,:) :: misfkt, misfkb !:Level of ice shelf base 56 #ifdef key_agrif 57 ! AGRIF can not handle these arrays as integers. The reason is a mystery but problems avoided by declaring them as reals 58 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION (:,:) :: misfkt, misfkb !:Level of ice shelf base 59 !: (first wet level and last level include in the tbl) 60 #else 61 INTEGER, PUBLIC, ALLOCATABLE, SAVE, DIMENSION (:,:) :: misfkt, misfkb !:Level of ice shelf base 62 #endif 57 63 !: (first wet level and last level include in the tbl) 58 64 … … 303 309 sbc_isf_alloc = 0 ! set to zero if no array to be allocated 304 310 IF( .NOT. ALLOCATED( qisf ) ) THEN 305 ALLOCATE( risf_tsc(jpi,jpj,jpts), risf_tsc_b(jpi,jpj,jpts), qisf(jpi,jpj), fwfisf(jpi,jpj), & 306 & fwfisf_b(jpi,jpj), misfkt(jpi,jpj), rhisf_tbl(jpi,jpj), r1_hisf_tbl(jpi,jpj), & 307 & rzisf_tbl(jpi,jpj), misfkb(jpi,jpj), ttbl(jpi,jpj), stbl(jpi,jpj), utbl(jpi,jpj), & 308 & vtbl(jpi, jpj), risfLeff(jpi,jpj), rhisf_tbl_0(jpi,jpj), ralpha(jpi,jpj), STAT= sbc_isf_alloc ) 311 ALLOCATE( risf_tsc(jpi,jpj,jpts), risf_tsc_b(jpi,jpj,jpts) , & 312 & qisf(jpi,jpj) , fwfisf(jpi,jpj) , fwfisf_b(jpi,jpj) , & 313 & rhisf_tbl(jpi,jpj), r1_hisf_tbl(jpi,jpj), rzisf_tbl(jpi,jpj) , & 314 & ttbl(jpi,jpj) , stbl(jpi,jpj) , utbl(jpi,jpj) , & 315 & vtbl(jpi, jpj) , risfLeff(jpi,jpj) , rhisf_tbl_0(jpi,jpj), & 316 & ralpha(jpi,jpj) , misfkt(jpi,jpj) , misfkb(jpi,jpj) , & 317 & STAT= sbc_isf_alloc ) 309 318 ! 310 319 IF( lk_mpp ) CALL mpp_sum ( sbc_isf_alloc ) … … 796 805 REAL(wp), DIMENSION(:,:,:), INTENT(inout) :: phdivn ! horizontal divergence 797 806 !! 798 INTEGER (wp):: ji, jj, jk ! dummy loop indices799 INTEGER (wp):: ikt, ikb800 INTEGER (wp):: nk_isf807 INTEGER :: ji, jj, jk ! dummy loop indices 808 INTEGER :: ikt, ikb 809 INTEGER :: nk_isf 801 810 REAL(wp) :: zhk, z1_hisf_tbl, zhisf_tbl 802 811 REAL(wp) :: zfact ! local scalar
Note: See TracChangeset
for help on using the changeset viewer.
