Changeset 2435
- Timestamp:
- 2010-11-25T17:33:31+01:00 (13 years ago)
- Location:
- branches/nemo_v3_3_beta/NEMOGCM/NEMO
- Files:
-
- 8 edited
-
OFF_SRC/dtadyn.F90 (modified) (8 diffs)
-
OPA_SRC/ASM/asminc.F90 (modified) (2 diffs)
-
OPA_SRC/DOM/domain.F90 (modified) (3 diffs)
-
OPA_SRC/DOM/domzgr.F90 (modified) (4 diffs)
-
OPA_SRC/LDF/ldfslp.F90 (modified) (2 diffs)
-
OPA_SRC/SBC/sbcice_lim.F90 (modified) (3 diffs)
-
OPA_SRC/SBC/sbcice_lim_2.F90 (modified) (2 diffs)
-
OPA_SRC/opa.F90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/nemo_v3_3_beta/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90
r2287 r2435 26 26 USE zpshde 27 27 USE lib_mpp ! distributed memory computing library 28 USE c1d 28 29 29 30 IMPLICIT NONE … … 183 184 ENDIF 184 185 185 IF( lk_ldfslp ) THEN186 IF( lk_ldfslp .AND. .NOT. lk_c1d ) THEN 186 187 ! Computes slopes. Caution : here tsn and avt are used as workspace 187 188 tsn (:,:,:,jp_tem) = tdta (:,:,:,2) … … 210 211 CALL dynrea( kt, iper ) ! data read for the iper period 211 212 212 IF( lk_ldfslp ) THEN213 IF( lk_ldfslp .AND. .NOT. lk_c1d ) THEN 213 214 ! Computes slopes. Caution : here tsn and avt are used as workspace 214 215 tsn (:,:,:,jp_tem) = tdta (:,:,:,2) … … 256 257 CALL dynrea( kt, iper ) ! data read for the iper period 257 258 258 IF( lk_ldfslp ) THEN259 IF( lk_ldfslp .AND. .NOT. lk_c1d ) THEN 259 260 ! Computes slopes. Caution : here tsn and avt are used as workspace 260 261 tsn (:,:,:,jp_tem) = tdta (:,:,:,2) … … 313 314 314 315 ! Compute bbl coefficients if needed 315 IF( lk_trabbl ) THEN316 IF( lk_trabbl .AND. .NOT. lk_c1d ) THEN 316 317 tsb(:,:,:,:) = tsn(:,:,:,:) 317 318 CALL bbl( kt, 'TRC') … … 682 683 wdta (:,:,:,1) = wdta (:,:,:,2) 683 684 684 #if defined key_ldfslp 685 #if defined key_ldfslp && ! defined key_c1d 685 686 uslpdta (:,:,:,1) = uslpdta (:,:,:,2) 686 687 vslpdta (:,:,:,1) = vslpdta (:,:,:,2) … … 733 734 734 735 735 #if defined key_ldfslp 736 #if defined key_ldfslp && ! defined key_c1d 736 737 uslp (:,:,:) = uslpdta (:,:,:,2) 737 738 vslp (:,:,:) = vslpdta (:,:,:,2) … … 794 795 795 796 796 #if defined key_ldfslp 797 #if defined key_ldfslp && ! defined key_c1d 797 798 uslp (:,:,:) = zweighm1 * uslpdta (:,:,:,1) + pweigh * uslpdta (:,:,:,2) 798 799 vslp (:,:,:) = zweighm1 * vslpdta (:,:,:,1) + pweigh * vslpdta (:,:,:,2) -
branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90
r2392 r2435 30 30 USE iom ! Library to read input files 31 31 USE asmpar ! Parameters for the assmilation interface 32 #if defined key_c1d 33 USE c1d, ONLY : lk_c1d ! 1D initialization 34 #endif 32 USE c1d ! 1D initialization 35 33 36 34 IMPLICIT NONE … … 674 672 CALL eos( tsb, rhd, rhop ) ! Before potential and in situ densities 675 673 676 #if ! defined key_c1d 677 IF( ln_zps ) & 674 IF( ln_zps .AND. .NOT. lk_c1d ) & 678 675 & CALL zps_hde( nit000, jpts, tsb, & ! Partial steps: before horizontal derivative 679 676 & gtsu, gtsv, rhd, & ! of T, S, rd at the bottom ocean level 680 677 & gru , grv ) 681 #endif682 678 683 679 DEALLOCATE( t_bkginc ) -
branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90
r2392 r2435 33 33 USE domwri ! domain: write the meshmask file 34 34 USE domvvl ! variable volume 35 #if defined key_c1d 35 USE c1d ! 1D vertical configuration 36 36 USE dyncor_c1d ! Coriolis term (c1d case) (cor_c1d routine) 37 #endif38 37 39 38 IMPLICIT NONE … … 65 64 !! - dom_stp: defined the model time step 66 65 !! - dom_wri: create the meshmask file if nmsh=1 67 !! - "key_c1d":1D configuration, move Coriolis, u and v at T-point66 !! - 1D configuration, move Coriolis, u and v at T-point 68 67 !!---------------------------------------------------------------------- 69 68 INTEGER :: jk ! dummy loop argument … … 84 83 IF( lk_vvl ) CALL dom_vvl ! Vertical variable mesh 85 84 ! 86 #if defined key_c1d 87 ! ! 1D configuration ("key_c1d") 88 CALL cor_c1d ! Coriolis set at T-point 89 umask(:,:,:) = tmask(:,:,:) ! U, V moved at T-point 90 vmask(:,:,:) = tmask(:,:,:) 91 #endif 85 IF( lk_c1d ) THEN ! 1D configuration 86 CALL cor_c1d ! Coriolis set at T-point 87 umask(:,:,:) = tmask(:,:,:) ! U, V moved at T-point 88 vmask(:,:,:) = tmask(:,:,:) 89 END IF 92 90 ! 93 91 hu(:,:) = 0.e0 ! Ocean depth at U- and V-points -
branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90
r2392 r2435 34 34 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 35 35 USE closea ! closed seas 36 USE c1d 36 37 37 38 IMPLICIT NONE … … 509 510 ! ! =============== ! 510 511 511 #if ! defined key_c1d 512 ! ! =================== ! 513 CALL zgr_bat_ctl ! Bathymetry check ! 514 ! ! =================== ! 515 #endif 512 ! ! =================== ! 513 IF( .NOT. lk_c1d ) CALL zgr_bat_ctl ! Bathymetry check ! 514 ! ! =================== ! 516 515 END SUBROUTINE zgr_bat 517 516 … … 1007 1006 ! ! =============== ! 1008 1007 1009 #if ! defined key_c1d 1010 ! ! =================== ! 1011 CALL zgr_bat_ctl ! Bathymetry check ! 1012 ! ! =================== ! 1013 #endif 1008 1009 ! ! =================== ! 1010 IF( .NOT. lk_c1d ) CALL zgr_bat_ctl ! Bathymetry check ! 1011 ! ! =================== ! 1014 1012 END SUBROUTINE zgr_zps 1015 1013 … … 1501 1499 ! ! =========== 1502 1500 1503 #if ! defined key_c1d 1504 ! ! =================== ! 1505 CALL zgr_bat_ctl ! Bathymetry check ! 1506 ! ! =================== ! 1507 #endif 1501 1502 ! ! =================== ! 1503 IF( .NOT. lk_c1d ) CALL zgr_bat_ctl ! Bathymetry check ! 1504 ! ! =================== ! 1508 1505 1509 1506 ! ! ============= -
branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90
r2401 r2435 200 200 ! !* horizontal Shapiro filter 201 201 DO jk = 2, jpkm1 202 DO jj = 2, jpjm1, jpj-3! rows jj=2 and =jpjm1 only202 DO jj = 2, jpjm1, MAX(1, jpj-3) ! rows jj=2 and =jpjm1 only 203 203 DO ji = 2, jpim1 204 204 uslp(ji,jj,jk) = z1_16 * ( zwz(ji-1,jj-1,jk) + zwz(ji+1,jj-1,jk) & … … 282 282 ! !* horizontal Shapiro filter 283 283 DO jk = 2, jpkm1 284 DO jj = 2, jpjm1, jpj-3 ! rows jj=2 and =jpjm1284 DO jj = 2, jpjm1, MAX(1, jpj-3) ! rows jj=2 and =jpjm1 only 285 285 DO ji = 2, jpim1 286 286 wslpi(ji,jj,jk) = ( zwz(ji-1,jj-1,jk) + zwz(ji+1,jj-1,jk) & -
branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90
r2370 r2435 47 47 USE limvar ! Ice variables switch 48 48 49 USE c1d ! 1D vertical configuration 49 50 USE lbclnk ! lateral boundary condition - MPP link 50 51 USE iom ! I/O manager library … … 192 193 IF( ln_nicep ) CALL lim_prt_state( jiindx, jjindx, 1, ' - Beginning the time step - ' ) ! control print 193 194 ! 194 #if ! defined key_c1d 195 IF( .NOT. lk_c1d ) THEN 195 196 ! Ice dynamics & transport (not in 1D case) 196 197 CALL lim_dyn( kt ) ! Ice dynamics ( rheology/dynamics ) … … 200 201 IF( ln_nicep ) CALL lim_prt_state( jiindx, jjindx,-1, ' - ice dyn & trp - ' ) ! control print 201 202 CALL lim_itd_me ! Mechanical redistribution ! (ridging/rafting) 202 #endif 203 ENDIF 203 204 ! ! Ice thermodynamics 204 205 CALL lim_var_glo2eqv ! equivalent variables -
branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90
r2370 r2435 39 39 USE limwri_2 40 40 USE limrst_2 41 42 USE c1d ! 1D vertical configuration 41 43 42 44 USE lbclnk ! lateral boundary condition - MPP link … … 179 181 180 182 CALL lim_rst_opn_2 ( kt ) ! Open Ice restart file 181 #if ! defined key_c1d 182 ! Ice dynamics & transport (except in 1D case) 183 IF( .NOT. lk_c1d ) THEN ! Ice dynamics & transport (except in 1D case) 183 184 CALL lim_dyn_2 ( kt ) ! Ice dynamics ( rheology/dynamics ) 184 185 CALL lim_trp_2 ( kt ) ! Ice transport ( Advection/diffusion ) 185 IF( ln_limdmp )CALL lim_dmp_2 ( kt ) ! Ice damping186 #endif 186 IF( ln_limdmp ) CALL lim_dmp_2 ( kt ) ! Ice damping 187 END IF 187 188 #if defined key_coupled 188 189 ! ! Ice surface fluxes in coupled mode -
branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/opa.F90
r2432 r2435 61 61 USE cpl_oasis4 ! OASIS4 coupling (not working) 62 62 #endif 63 #if defined key_c1d64 63 USE c1d ! 1D configuration 65 64 USE step_c1d ! Time stepping loop for the 1D configuration 66 #endif67 65 #if defined key_top 68 66 USE trcini ! passive tracer initialisation … … 408 406 ENDIF 409 407 ! 410 #if defined key_c1d411 408 IF( lk_c1d .AND. .NOT. lk_iomput ) & 412 409 CALL ctl_stop( ' The 1D vertical configuration must be used in conjunction', & 413 410 & ' with the IOM Input/Output manager. Compile with key_iomput enabled' ) 414 #endif415 411 ! 416 412 END SUBROUTINE opa_ctl
Note: See TracChangeset
for help on using the changeset viewer.
