Changeset 3263 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM
- Timestamp:
- 2012-01-17T15:10:34+01:00 (13 years ago)
- Location:
- branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90
r3191 r3263 329 329 ,nn_dyn3d_dta(ib_bdy) & 330 330 ,nn_tra_dta(ib_bdy) & 331 #if defined key_ ice_lim2331 #if defined key_lim2 332 332 ,nn_ice_lim2_dta(ib_bdy) & 333 333 #endif -
branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90
r3203 r3263 38 38 USE dianam ! build name of file 39 39 USE lib_mpp ! distributed memory computing library 40 #if defined key_ ice_lim2 || defined key_ice_lim340 #if defined key_lim2 || defined key_lim3 41 41 USE ice 42 42 #endif … … 794 794 ENDDO !end of loop on the density classes 795 795 796 #if defined key_ ice_lim796 #if defined key_lim2 || defined key_lim3 797 797 798 798 !ICE CASE -
branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90
r3186 r3263 1015 1015 & un, vn, & 1016 1016 & sshn 1017 #if defined key_ ice_lim1017 #if defined key_lim2 || defined key_lim3 1018 1018 USE ice, ONLY : & ! LIM Ice model variables 1019 1019 & frld … … 1031 1031 INTEGER :: jveloset ! velocity profile data loop variable 1032 1032 INTEGER :: jvar ! Variable number 1033 #if ! defined key_ ice_lim1033 #if ! defined key_lim2 && ! defined key_lim3 1034 1034 REAL(wp), POINTER, DIMENSION(:,:) :: frld 1035 1035 #endif 1036 1036 CHARACTER(LEN=20) :: datestr=" ",timestr=" " 1037 1037 1038 #if ! defined key_ ice_lim1038 #if ! defined key_lim2 && ! defined key_lim3 1039 1039 CALL wrk_alloc(jpi,jpj,frld) 1040 1040 #endif … … 1051 1051 ! No LIM => frld == 0.0_wp 1052 1052 !----------------------------------------------------------------------- 1053 #if ! defined key_ ice_lim1053 #if ! defined key_lim2 && ! defined key_lim3 1054 1054 frld(:,:) = 0.0_wp 1055 1055 #endif … … 1099 1099 ENDIF 1100 1100 1101 #if defined key_ ice_lim1101 #if defined key_lim2 || defined key_lim3 1102 1102 IF ( ln_seaice ) THEN 1103 1103 DO jseaiceset = 1, nseaicesets … … 1119 1119 ENDIF 1120 1120 1121 #if ! defined key_ ice_lim1121 #if ! defined key_lim2 && ! defined key_lim3 1122 1122 CALL wrk_dealloc(jpi,jpj,frld) 1123 1123 #endif
Note: See TracChangeset
for help on using the changeset viewer.