- Timestamp:
- 2010-08-27T14:04:19+02:00 (14 years ago)
- Location:
- branches/DEV_r1879_FCM/NEMOGCM
- Files:
-
- 4 deleted
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DEV_r1879_FCM/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90
r1694 r2066 34 34 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 35 35 USE closea ! closed seas 36 USE c1d ! 1D configuration37 36 38 37 IMPLICIT NONE … … 482 481 ! ! =============== ! 483 482 484 ! ! =================== ! 485 IF( .NOT. lk_c1d ) CALL zgr_bat_ctl ! Bathymetry check ! 486 ! ! =================== ! 483 #if ! defined key_c1d 484 ! ! =================== ! 485 CALL zgr_bat_ctl ! Bathymetry check ! 486 ! ! =================== ! 487 #endif 487 488 END SUBROUTINE zgr_bat 488 489 … … 984 985 ! ! =============== ! 985 986 986 ! ! =================== ! 987 IF( .NOT. lk_c1d ) CALL zgr_bat_ctl ! Bathymetry check ! 988 ! ! =================== ! 987 #if ! defined key_c1d 988 ! ! =================== ! 989 CALL zgr_bat_ctl ! Bathymetry check ! 990 ! ! =================== ! 991 #endif 989 992 END SUBROUTINE zgr_zps 990 993 … … 1476 1479 ! ! =========== 1477 1480 1478 ! ! =================== ! 1479 IF( .NOT. lk_c1d ) CALL zgr_bat_ctl ! Bathymetry check ! 1480 ! ! =================== ! 1481 #if ! defined key_c1d 1482 ! ! =================== ! 1483 CALL zgr_bat_ctl ! Bathymetry check ! 1484 ! ! =================== ! 1485 #endif 1481 1486 1482 1487 ! ! ============= -
branches/DEV_r1879_FCM/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90
r2007 r2066 32 32 USE bdydta ! unstructured open boundary conditions 33 33 USE bdydyn ! unstructured open boundary conditions 34 USE agrif_opa_update35 USE agrif_opa_interp36 34 USE in_out_manager ! I/O manager 37 35 USE lbclnk ! lateral boundary condition (or mpp link) 38 36 USE prtctl ! Print control 37 #if defined key_agrif 38 USE agrif_opa_update 39 USE agrif_opa_interp 40 #endif 39 41 40 42 IMPLICIT NONE -
branches/DEV_r1879_FCM/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90
r2013 r2066 44 44 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 45 45 USE prtctl ! Print control 46 USE agrif_opa_interp47 46 USE iom 48 47 USE restart ! only for lrst_oce 48 #if defined key_agrif 49 USE agrif_opa_interp 50 #endif 49 51 50 52 IMPLICIT NONE -
branches/DEV_r1879_FCM/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90
r1613 r2066 20 20 USE in_out_manager ! I/O manager 21 21 USE iom ! I/O module 22 USE c1d ! re-initialization of u-v mask for the 1D configuration23 22 USE zpshde ! partial step: hor. derivative (zps_hde routine) 24 23 USE eosbn2 ! equation of state (eos bn2 routine) -
branches/DEV_r1879_FCM/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90
r1715 r2066 19 19 !!---------------------------------------------------------------------- 20 20 USE oce ! ocean dynamics and tracers 21 USE c1d ! 1d configuration22 21 USE dom_oce ! ocean space and time domain 23 22 USE lib_mpp … … 196 195 IF( ln_nicep ) CALL lim_prt_state( jiindx, jjindx, 1, ' - Beginning the time step - ' ) ! control print 197 196 ! 198 IF( .NOT. lk_c1d ) THEN ! Ice dynamics & transport (not in 1D case) 197 #if ! defined key_c1d 198 ! Ice dynamics & transport (not in 1D case) 199 199 CALL lim_dyn( kt ) ! Ice dynamics ( rheology/dynamics ) 200 200 CALL lim_trp( kt ) ! Ice transport ( Advection/diffusion ) … … 203 203 IF( ln_nicep ) CALL lim_prt_state( jiindx, jjindx,-1, ' - ice dyn & trp - ' ) ! control print 204 204 CALL lim_itd_me ! Mechanical redistribution ! (ridging/rafting) 205 ENDIF 205 #endif 206 206 ! 207 207 ! ! Ice thermodynamics -
branches/DEV_r1879_FCM/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90
r1715 r2066 17 17 !!---------------------------------------------------------------------- 18 18 USE oce ! ocean dynamics and tracers 19 USE c1d ! 1d configuration20 19 USE dom_oce ! ocean space and time domain 21 20 USE lib_mpp … … 174 173 175 174 CALL lim_rst_opn_2 ( kt ) ! Open Ice restart file 176 IF( .NOT. lk_c1d ) THEN ! Ice dynamics & transport (not in 1D case) 175 #if ! defined key_c1d 176 ! Ice dynamics & transport (not in 1D case) 177 177 CALL lim_dyn_2 ( kt ) ! Ice dynamics ( rheology/dynamics ) 178 178 CALL lim_trp_2 ( kt ) ! Ice transport ( Advection/diffusion ) 179 179 IF( ln_limdmp ) CALL lim_dmp_2 ( kt ) ! Ice damping 180 ENDIF 180 #endif 181 181 #if defined key_coupled 182 182 IF( ksbc == 5 ) CALL sbc_cpl_ice_flx( frld , & -
branches/DEV_r1879_FCM/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90
r2007 r2066 36 36 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 37 37 USE prtctl ! Print control 38 USE obc_oce 39 #if defined key_agrif 38 40 USE agrif_opa_update 39 41 USE agrif_opa_interp 40 USE obc_oce 42 #endif 41 43 42 44 IMPLICIT NONE -
branches/DEV_r1879_FCM/NEMOGCM/NEMO/OPA_SRC/istate.F90
r1566 r2066 34 34 USE in_out_manager ! I/O manager 35 35 USE iom 36 USE c1d ! re-initialization of u-v mask for the 1D configuration37 36 USE zpshde ! partial step: hor. derivative (zps_hde routine) 38 37 USE eosbn2 ! equation of state (eos bn2 routine) … … 124 123 CALL eos( tb, sb, rhd, rhop ) ! before potential and in situ densities 125 124 126 IF( ln_zps .AND. .NOT. lk_c1d ) & 125 #if ! defined key_c1d 126 IF( ln_zps ) & 127 127 & CALL zps_hde( nit000, tb, sb, rhd, & ! Partial steps: before Horizontal DErivative 128 128 & gtu, gsu, gru, & ! of t, s, rd at the bottom ocean level 129 129 & gtv, gsv, grv ) 130 #endif 130 131 131 132 ENDIF -
branches/DEV_r1879_FCM/NEMOGCM/NEMO/OPA_SRC/opa.F90
r2007 r2066 62 62 USE dynspg_oce ! Control choice of surface pressure gradient schemes 63 63 USE prtctl ! Print control (prt_ctl_init routine) 64 USE c1d ! 1D configuration 64 #if defined key_c1d 65 65 USE dyncor_c1d ! Coriolis factor at T-point 66 66 USE step_c1d ! Time stepping loop for the 1D configuration 67 #endif 67 68 #if defined key_top 68 69 USE trcini ! passive tracer initialisation … … 127 128 ! !-----------------------! 128 129 istp = nit000 129 IF( lk_c1d ) THEN !== 1D configuration ==! 130 DO WHILE ( istp <= nitend .AND. nstop == 0 ) 131 CALL stp_c1d( istp ) 132 istp = istp + 1 133 END DO 134 ELSE !== 3D ocean with ==! 135 DO WHILE ( istp <= nitend .AND. nstop == 0 ) 136 #if defined key_agrif 137 CALL Agrif_Step( stp ) ! AGRIF: time stepping 130 #if defined key_c1d 131 !== 1D configuration ==! 132 DO WHILE ( istp <= nitend .AND. nstop == 0 ) 133 CALL stp_c1d( istp ) 134 istp = istp + 1 135 END DO 138 136 #else 139 CALL stp( istp ) ! standard time stepping 140 #endif 141 istp = istp + 1 142 IF( lk_mpp ) CALL mpp_max( nstop ) 143 END DO 144 ENDIF 145 137 !== 3D ocean with ==! 138 DO WHILE ( istp <= nitend .AND. nstop == 0 ) 139 # if defined key_agrif 140 CALL Agrif_Step( stp ) ! AGRIF: time stepping 141 # else 142 CALL stp( istp ) ! standard time stepping 143 # endif 144 istp = istp + 1 145 IF( lk_mpp ) CALL mpp_max( nstop ) 146 END DO 147 #endif 146 148 ! !------------------------! 147 149 ! !== finalize the run ==! … … 251 253 CALL dom_init ! Domain 252 254 !!gm c1d case can be moved in dom_init routine 253 IF( lk_c1d ) THEN ! 1D configuration 255 #if defined key_c1d 254 256 CALL cor_c1d ! Coriolis defined at T-point 255 257 umask(:,:,:) = tmask(:,:,:) ! U, V and T-points are the same 256 258 vmask(:,:,:) = tmask(:,:,:) ! 257 ENDIF 259 #endif 258 260 !!gm c1d end 259 261 -
branches/DEV_r1879_FCM/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90
r2013 r2066 30 30 USE trdmld_trc 31 31 USE trdmld_trc_oce 32 # if defined key_agrif 32 33 USE agrif_top_update 33 34 USE agrif_top_interp 35 # endif 34 36 35 37 IMPLICIT NONE -
branches/DEV_r1879_FCM/NEMOGCM/TOOLS/cfg.txt
r1987 r2066 1 GYRE OPA_SRC LIM_SRC_2 C1D_SRC1 GYRE OPA_SRC 2 2 ORCA2_LIM_PISCES OPA_SRC LIM_SRC_2 NST_SRC C1D_SRC TOP_SRC 3 GYRE_LOBSTER OPA_SRC LIM_SRC_2 NST_SRC C1D_SRCTOP_SRC3 GYRE_LOBSTER OPA_SRC TOP_SRC 4 4 ORCA2_OFF_PISCES OFF_SRC TOP_SRC 5 POMME OPA_SRC LIM_SRC_2 NST_SRC C1D_SRC5 POMME OPA_SRC NST_SRC 6 6 ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC C1D_SRC
Note: See TracChangeset
for help on using the changeset viewer.