Changeset 15010 for NEMO/branches/2021
- Timestamp:
- 2021-06-17T14:14:52+02:00 (3 years ago)
- Location:
- NEMO/branches/2021/ticket2680_C1D_PAPA/src
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2021/ticket2680_C1D_PAPA/src/ICE/icestp.F90
r14886 r15010 159 159 CALL ice_rst_opn( kt ) ! Open Ice restart file (if necessary) 160 160 ! 161 IF( ln_icedyn .AND. .NOT.l k_c1d ) &161 IF( ln_icedyn .AND. .NOT.ln_c1d ) & 162 162 & CALL ice_dyn( kt, Kmm ) ! -- Ice dynamics 163 163 ! -
NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/ASM/asminc.F90
r14834 r15010 617 617 !!gm 618 618 619 IF( ln_zps .AND. .NOT. l k_c1d .AND. .NOT. ln_isfcav) &619 IF( ln_zps .AND. .NOT. ln_c1d .AND. .NOT. ln_isfcav) & 620 620 & CALL zps_hde ( kt, Kmm, jpts, pts(:,:,:,:,Kbb), gtsu, gtsv, & ! Partial steps: before horizontal gradient 621 621 & rhd, gru , grv ) ! of t, s, rd at the last ocean level 622 IF( ln_zps .AND. .NOT. l k_c1d .AND. ln_isfcav) &622 IF( ln_zps .AND. .NOT. ln_c1d .AND. ln_isfcav) & 623 623 & CALL zps_hde_isf( nit000, Kmm, jpts, pts(:,:,:,:,Kbb), gtsu, gtsv, gtui, gtvi, & ! Partial steps for top cell (ISF) 624 624 & rhd, gru , grv , grui, grvi ) ! of t, s, rd at the last ocean level -
NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/C1D/c1d.F90
r15006 r15010 8 8 !! 3.5 ! 2013-10 (D. Calvert) add namelist 9 9 !!---------------------------------------------------------------------- 10 #if defined key_c1d 11 !!---------------------------------------------------------------------- 12 !! 'key_c1d' 1D column configuration 10 13 11 !!---------------------------------------------------------------------- 14 12 !! c1d_init : read in the C1D namelist … … 23 21 24 22 PUBLIC c1d_init ! called by nemogcm.F90 25 26 LOGICAL , PUBLIC, PARAMETER :: lk_c1d = .TRUE. ! 1D config. flag27 23 28 24 REAL(wp), PUBLIC :: rn_lat1d !: Column latitude … … 67 63 END SUBROUTINE c1d_init 68 64 69 #else70 !!----------------------------------------------------------------------71 !! Dummy module : No use of 1D configuration72 !!----------------------------------------------------------------------73 USE par_kind ! kind parameters74 LOGICAL, PUBLIC, PARAMETER :: lk_c1d = .FALSE. !: 1D config. flag de-activated75 REAL(wp) :: rn_lat1d, rn_lon1d76 CONTAINS77 SUBROUTINE c1d_init ! Dummy routine78 END SUBROUTINE c1d_init79 #endif80 81 65 !!====================================================================== 82 66 END MODULE c1d -
NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/DOM/domain.F90
r15008 r15010 48 48 USE wet_dry , ONLY : ll_wd ! wet & drying flag 49 49 USE closea , ONLY : dom_clo ! closed seas routine 50 USE c1d 50 51 ! 51 52 USE in_out_manager ! I/O manager … … 127 128 CALL dom_tile_init ! Tile domain 128 129 130 IF( ln_c1d ) CALL c1d_init ! 1D column configuration 129 131 ! 130 132 CALL dom_hgr ! Horizontal mesh -
NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/nemogcm.F90
r15006 r15010 407 407 CALL phy_cst ! Physical constants 408 408 CALL eos_init ! Equation of state 409 IF( lk_c1d ) CALL c1d_init ! 1D column configuration410 409 CALL wad_init ! Wetting and drying options 411 410 … … 459 458 460 459 ! ! Dynamics 461 IF( l k_c1d ) CALL dyn_dmp_init ! internal momentum damping460 IF( ln_c1d ) CALL dyn_dmp_init ! internal momentum damping 462 461 CALL dyn_adv_init ! advection (vector or flux form) 463 462 CALL dyn_vor_init ! vorticity term including Coriolis -
NEMO/branches/2021/ticket2680_C1D_PAPA/src/OFF/dtadyn.F90
r14310 r15010 21 21 !!---------------------------------------------------------------------- 22 22 USE oce ! ocean dynamics and tracers variables 23 USE c1d ! 1D configuration: l k_c1d23 USE c1d ! 1D configuration: ln_c1d 24 24 USE dom_oce ! ocean domain: variables 25 25 #if defined key_qco … … 135 135 CALL fld_read( kt, 1, sf_dyn ) != read data at kt time step ==! 136 136 ! 137 IF( l_ldfslp .AND. .NOT.l k_c1d ) CALL dta_dyn_slp( kt, Kbb, Kmm ) ! Computation of slopes137 IF( l_ldfslp .AND. .NOT.ln_c1d ) CALL dta_dyn_slp( kt, Kbb, Kmm ) ! Computation of slopes 138 138 ! 139 139 ts(:,:,:,jp_tem,Kmm) = sf_dyn(jf_tem)%fnow(:,:,:) * tmask(:,:,:) ! temperature … … 187 187 avs(:,:,:) = avt(:,:,:) 188 188 ! 189 IF( ln_trabbl .AND. .NOT.l k_c1d ) THEN ! diffusive Bottom boundary layer param189 IF( ln_trabbl .AND. .NOT.ln_c1d ) THEN ! diffusive Bottom boundary layer param 190 190 ahu_bbl(:,:) = sf_dyn(jf_ubl)%fnow(:,:,1) * umask(:,:,1) ! bbl diffusive coef 191 191 ahv_bbl(:,:) = sf_dyn(jf_vbl)%fnow(:,:,1) * vmask(:,:,1) … … 321 321 END DO 322 322 ! 323 IF( l_ldfslp .AND. .NOT.l k_c1d ) THEN ! slopes323 IF( l_ldfslp .AND. .NOT.ln_c1d ) THEN ! slopes 324 324 IF( sf_dyn(jf_tem)%ln_tint ) THEN ! time interpolation 325 325 ALLOCATE( uslpdta (jpi,jpj,jpk,2), vslpdta (jpi,jpj,jpk,2), & … … 628 628 & / REAL( sf_dyn(jf_tem)%nrec(2,sf_dyn(jf_tem)%naa) - sf_dyn(jf_tem)%nrec(2,sf_dyn(jf_tem)%nbb), wp ) 629 629 ztintb = 1. - ztinta 630 IF( l_ldfslp .AND. .NOT.l k_c1d ) THEN ! Computes slopes (here avt is used as workspace)630 IF( l_ldfslp .AND. .NOT.ln_c1d ) THEN ! Computes slopes (here avt is used as workspace) 631 631 uslp (:,:,:) = ztintb * uslpdta (:,:,:,1) + ztinta * uslpdta (:,:,:,2) 632 632 vslp (:,:,:) = ztintb * vslpdta (:,:,:,1) + ztinta * vslpdta (:,:,:,2) … … 640 640 CALL compute_slopes( kt, zts, zuslp, zvslp, zwslpi, zwslpj, Kbb, Kmm ) 641 641 ! 642 IF( l_ldfslp .AND. .NOT.l k_c1d ) THEN ! Computes slopes (here avt is used as workspace)642 IF( l_ldfslp .AND. .NOT.ln_c1d ) THEN ! Computes slopes (here avt is used as workspace) 643 643 uslp (:,:,:) = zuslp (:,:,:) 644 644 vslp (:,:,:) = zvslp (:,:,:) … … 665 665 !!--------------------------------------------------------------------- 666 666 ! 667 IF( l_ldfslp .AND. .NOT.l k_c1d ) THEN ! Computes slopes (here avt is used as workspace)667 IF( l_ldfslp .AND. .NOT.ln_c1d ) THEN ! Computes slopes (here avt is used as workspace) 668 668 CALL eos ( pts, rhd, rhop, gdept_0(:,:,:) ) 669 669 CALL eos_rab( pts, rab_n, Kmm ) ! now local thermal/haline expension ratio at T-points -
NEMO/branches/2021/ticket2680_C1D_PAPA/src/OFF/nemogcm.F90
r14834 r15010 348 348 CALL phy_cst ! Physical constants 349 349 CALL eos_init ! Equation of state 350 IF( l k_c1d ) CALL c1d_init ! 1D column configuration350 IF( ln_c1d ) CALL c1d_init ! 1D column configuration 351 351 CALL dom_init( Nbb, Nnn, Naa ) ! Domain 352 352 IF( sn_cfctl%l_prtctl ) & -
NEMO/branches/2021/ticket2680_C1D_PAPA/src/SAS/sbcssm.F90
r14510 r15010 12 12 !!---------------------------------------------------------------------- 13 13 USE oce ! ocean dynamics and tracers variables 14 USE c1d ! 1D configuration: l k_c1d14 USE c1d ! 1D configuration: ln_c1d 15 15 USE dom_oce ! ocean domain: variables 16 16 USE zdf_oce ! ocean vertical physics: variables -
NEMO/branches/2021/ticket2680_C1D_PAPA/src/TOP/PISCES/P4Z/p4zsms.F90
r14086 r15010 406 406 407 407 IF( cn_cfg == "ORCA" .OR. cn_cfg == "orca") THEN 408 IF( .NOT. l k_c1d ) THEN ! ORCA configuration (not 1D) !408 IF( .NOT. ln_c1d ) THEN ! ORCA configuration (not 1D) ! 409 409 ! ! --------------------------- ! 410 410 ! set total alkalinity, phosphate, nitrate & silicate -
NEMO/branches/2021/ticket2680_C1D_PAPA/src/TOP/PISCES/SED/trcdmp_sed.F90
r14086 r15010 133 133 IF( trc_dmp_sed_alloc() /= 0 ) CALL ctl_stop( 'STOP', 'trc_dmp_sed_ini: unable to allocate arrays' ) 134 134 ! 135 IF( .NOT.l k_c1d ) THEN135 IF( .NOT.ln_c1d ) THEN 136 136 !Read in mask from file 137 137 restosed(:,:,:) = 0.5 / rday -
NEMO/branches/2021/ticket2680_C1D_PAPA/src/TOP/TRP/trcdmp.F90
r14086 r15010 199 199 END SELECT 200 200 201 IF( .NOT.l k_c1d ) THEN201 IF( .NOT.ln_c1d ) THEN 202 202 IF( .NOT.ln_tradmp ) & 203 203 & CALL ctl_stop( 'passive tracer damping need ln_tradmp to compute damping coef.' ) -
NEMO/branches/2021/ticket2680_C1D_PAPA/src/TOP/TRP/trctrp.F90
r14086 r15010 63 63 IF( ln_timing ) CALL timing_start('trc_trp') 64 64 ! 65 IF( .NOT. l k_c1d ) THEN65 IF( .NOT. ln_c1d ) THEN 66 66 ! 67 67 ! ! Partial top/bottom cell: GRADh( trb )
Note: See TracChangeset
for help on using the changeset viewer.