Changeset 5927
- Timestamp:
- 2015-11-26T12:23:11+01:00 (8 years ago)
- Location:
- branches/2015/dev_r5847_MERCATOR9_solveur_simplification/NEMOGCM
- Files:
-
- 1 deleted
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_r5847_MERCATOR9_solveur_simplification/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_cfg
r5917 r5927 137 137 &namtra_qsr ! penetrative solar radiation 138 138 !----------------------------------------------------------------------- 139 ! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask ! 140 ! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename ! 141 sn_chl ='chlorophyll_PAPASTATION', -1 , 'CHLA' , .true. , .true. , 'yearly' , '' , '' , '' 139 142 / 140 143 !----------------------------------------------------------------------- -
branches/2015/dev_r5847_MERCATOR9_solveur_simplification/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/namelist_cfg
r5917 r5927 183 183 ln_hpg_zco = .false. ! z-coordinate - full steps 184 184 ln_hpg_zps = .false. ! z-coordinate - partial steps (interpolation) 185 ln_hpg_sco = . true.! s-coordinate (standard jacobian formulation)185 ln_hpg_sco = .false. ! s-coordinate (standard jacobian formulation) 186 186 ln_hpg_djc = .false. ! s-coordinate (Density Jacobian with Cubic polynomial) 187 ln_hpg_prj = . false.! s-coordinate (Pressure Jacobian scheme)187 ln_hpg_prj = .true. ! s-coordinate (Pressure Jacobian scheme) 188 188 / 189 189 !----------------------------------------------------------------------- -
branches/2015/dev_r5847_MERCATOR9_solveur_simplification/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90
r5917 r5927 439 439 CHARACTER(len=100) :: cn_dir ! Root directory for location of data files 440 440 CHARACTER(len=100), DIMENSION(nb_bdy) :: cn_dir_array ! Root directory for location of data files 441 CHARACTER(len = 256):: clname ! temporary file name 441 442 LOGICAL :: ln_full_vel ! =T => full velocities in 3D boundary data 442 443 ! =F => baroclinic velocities in 3D boundary data … … 678 679 ! sea ice 679 680 IF( nn_ice_lim_dta(ib_bdy) .eq. 1 ) THEN 680 681 681 ! Test for types of ice input (lim2 or lim3) 682 CALL iom_open ( bn_a_i%clname, inum ) 683 id1 = iom_varid ( inum, bn_a_i%clvar, kdimsz=zdimsz, kndims=zndims, ldstop = .FALSE. ) 682 ! Build file name to find dimensions 683 clname=TRIM(bn_a_i%clname) 684 IF( .NOT. bn_a_i%ln_clim ) THEN 685 WRITE(clname, '(a,"_y",i4.4)' ) TRIM( bn_a_i%clname ), nyear ! add year 686 IF( bn_a_i%cltype /= 'yearly' ) WRITE(clname, '(a,"m" ,i2.2)' ) TRIM( clname ), nmonth ! add month 687 ELSE 688 IF( bn_a_i%cltype /= 'yearly' ) WRITE(clname, '(a,"_m",i2.2)' ) TRIM( bn_a_i%clname ), nmonth ! add month 689 ENDIF 690 IF( bn_a_i%cltype == 'daily' .OR. bn_a_i%cltype(1:4) == 'week' ) & 691 & WRITE(clname, '(a,"d" ,i2.2)' ) TRIM( clname ), nday ! add day 692 ! 693 CALL iom_open ( clname, inum ) 694 id1 = iom_varid( inum, bn_a_i%clvar, kdimsz=zdimsz, kndims=zndims, ldstop = .FALSE. ) 684 695 CALL iom_close ( inum ) 685 !CALL fld_clopn ( bn_a_i, nyear, nmonth, nday, ldstop=.TRUE. ) 686 !CALL iom_open ( bn_a_i%clname, inum ) 687 !id1 = iom_varid ( bn_a_i%num, bn_a_i%clvar, kdimsz=zdimsz, kndims=zndims, ldstop = .FALSE. ) 696 688 697 IF ( zndims == 4 ) THEN 689 698 ll_bdylim3 = .TRUE. ! lim3 input -
branches/2015/dev_r5847_MERCATOR9_solveur_simplification/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90
r5836 r5927 18 18 #endif 19 19 USE dyncor_c1d ! Coriolis term (c1d case) (dyn_cor_1d ) 20 USE dynnxt _c1d! time-stepping (dyn_nxt routine)20 USE dynnxt ! time-stepping (dyn_nxt routine) 21 21 USE dyndmp ! U & V momentum damping (dyn_dmp routine) 22 22 USE restart ! restart … … 139 139 CALL dyn_cor_c1d( kstp ) ! vorticity term including Coriolis 140 140 CALL dyn_zdf ( kstp ) ! vertical diffusion 141 CALL dyn_nxt _c1d( kstp ) ! lateral velocity at next time step141 CALL dyn_nxt ( kstp ) ! lateral velocity at next time step 142 142 143 143 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -
branches/2015/dev_r5847_MERCATOR9_solveur_simplification/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90
r5917 r5927 36 36 USE trd_oce ! trends: ocean variables 37 37 USE trddyn ! trend manager: dynamics 38 USE zpshde ! partial step: hor. derivative (zps_hde routine)38 !jc USE zpshde ! partial step: hor. derivative (zps_hde routine) 39 39 ! 40 40 USE in_out_manager ! I/O manager … … 293 293 294 294 ! Partial steps: bottom before horizontal gradient of t, s, rd at the last ocean level 295 CALL zps_hde ( kt, jpts, tsn, gtsu, gtsv, rhd, gru , grv )295 !jc CALL zps_hde ( kt, jpts, tsn, gtsu, gtsv, rhd, gru , grv ) 296 296 297 297 ! Local constant initialization … … 494 494 495 495 ! Partial steps: top & bottom before horizontal gradient 496 CALL zps_hde_isf( kt, jpts, tsn, gtsu, gtsv, gtui, gtvi, &497 & rhd, gru , grv , aru , arv , gzu , gzv , ge3ru , ge3rv , &498 & grui, grvi, arui, arvi, gzui, gzvi, ge3rui, ge3rvi )496 !jc CALL zps_hde_isf( kt, jpts, tsn, gtsu, gtsv, gtui, gtvi, & 497 !jc & rhd, gru , grv , aru , arv , gzu , gzv , ge3ru , ge3rv , & 498 !jc & grui, grvi, arui, arvi, gzui, gzvi, ge3rui, ge3rvi ) 499 499 500 500 !================================================================================== -
branches/2015/dev_r5847_MERCATOR9_solveur_simplification/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90
r5908 r5927 32 32 USE trd_oce ! trends: ocean variables 33 33 USE trddyn ! trend manager: dynamics 34 USE c1d ! 1D vertical configuration 34 35 ! 35 36 USE lbclnk ! ocean lateral boundary conditions (or mpp link) … … 662 663 IF( ln_dynvor_een ) THEN ; ioptio = ioptio + 1 ; nvor_scheme = np_EEN ; ENDIF 663 664 ! 664 IF( ioptio /= 1) CALL ctl_stop( ' use ONE and ONLY one vorticity scheme' )665 IF( ( ioptio /= 1).AND.( .NOT.lk_c1d ) ) CALL ctl_stop( ' use ONE and ONLY one vorticity scheme' ) 665 666 ! 666 667 IF(lwp) WRITE(numout,*) ! type of calculated vorticity (set ncor, nrvm, ntot) -
branches/2015/dev_r5847_MERCATOR9_solveur_simplification/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90
r5836 r5927 26 26 USE ldftra ! lateral diffusion: eddy diffusivity & EIV coeff. 27 27 USE ldfslp ! Lateral diffusion: slopes of neutral surfaces 28 USE c1d ! 1D vertical configuration 28 29 ! 29 30 USE in_out_manager ! I/O manager … … 214 215 CALL ctl_warn( 'tra_adv_init: You are running without tracer advection.' ) 215 216 ENDIF 216 IF( ioptio /= 1 ) CALL ctl_stop( 'tra_adv_init: Choose ONE advection scheme in namelist namtra_adv' ) 217 IF( (ioptio /= 1).AND. (.NOT. lk_c1d ) ) & 218 CALL ctl_stop( 'tra_adv_init: Choose ONE advection scheme in namelist namtra_adv' ) 217 219 ! 218 220 IF( ln_traadv_cen .AND. ( nn_cen_h /= 2 .AND. nn_cen_h /= 4 ) & ! Centered -
branches/2015/dev_r5847_MERCATOR9_solveur_simplification/NEMOGCM/NEMO/OPA_SRC/step.F90
r5917 r5927 191 191 !!gm 192 192 CALL eos ( tsn, rhd, rhop, fsdept_n(:,:,:) ) ! now in situ density for hpg computation 193 194 !!jc: fs simplification 195 !!jc: lines below useless if lk_vvl=T. Keep it here (which maintains a bug if lk_vvl=F and ln_zps=T, cf ticket #1636) 196 !! but ensures reproductible results 197 !! with previous versions using split-explicit free surface 198 IF( ln_zps .AND. .NOT. ln_isfcav) & ! Partial steps: bottom before horizontal gradient 199 & CALL zps_hde ( kstp, jpts, tsn, gtsu, gtsv, & ! of t, s, rd at the last ocean level 200 & rhd, gru , grv ) 201 IF( ln_zps .AND. ln_isfcav) & ! Partial steps: top & bottom before horizontal gradient 202 & CALL zps_hde_isf( kstp, jpts, tsn, gtsu, gtsv, gtui, gtvi, & 203 & rhd, gru , grv , aru , arv , gzu , gzv , ge3ru , ge3rv , & 204 & grui, grvi, arui, arvi, gzui, gzvi, ge3rui, ge3rvi ) 205 !!jc: fs simplification 193 206 194 207 ua(:,:,:) = 0._wp ! set dynamics trends to zero
Note: See TracChangeset
for help on using the changeset viewer.