Changeset 188


Ignore:
Timestamp:
05/11/18 11:16:11 (6 years ago)
Author:
dumas
Message:

Bug in dragging : all ocean points need to be flgzmx and flgzmy

Location:
trunk/SOURCES
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/SOURCES/dragging_param_beta_mod.f90

    r168 r188  
    232232flgzmy(:,:) = flgzmy(:,:) .or. gzmy(:,:) 
    233233 
    234 where (hmx(:,:).eq.0.) 
    235   flgzmx(:,:) = .false. 
    236 endwhere 
    237 where (hmy(:,:).eq.0.) 
    238   flgzmy(:,:) = .false. 
    239 endwhere 
    240  
    241234fleuvemx(:,:)=gzmx(:,:) 
    242235fleuvemy(:,:)=gzmy(:,:) 

  • trunk/SOURCES/dragging_param_beta_nolin_mod.f90

    r168 r188  
    246246flgzmy(:,:) = flgzmy(:,:) .or. gzmy(:,:) 
    247247 
    248 where (hmx(:,:).eq.0.) 
    249   flgzmx(:,:) = .false. 
    250 endwhere 
    251 where (hmy(:,:).eq.0.) 
    252   flgzmy(:,:) = .false. 
    253 endwhere 
    254  
    255248fleuvemx(:,:)=gzmx(:,:) 
    256249fleuvemy(:,:)=gzmy(:,:) 

  • trunk/SOURCES/dragging_param_beta_sedim_mod.f90

    r178 r188  
    208208!$OMP WORKSHARE 
    209209 
    210 ! new parametrisation of beta on Neff: 
    211 betamx(:,:)= beta_slope*(neffmx(:,:)**beta_expo) !/neffmin 
    212 betamy(:,:)= beta_slope*(neffmy(:,:)**beta_expo) !/neffmin 
     210where (h_sedimmx(:,:).le.seuil_sedim) 
     211  betamx(:,:)= beta_slope*(neffmx(:,:)**beta_expo) 
     212elsewhere 
     213  betamx(:,:)= beta_slope*(neffmx(:,:)**beta_expo) * coef_sedim 
     214endwhere 
     215 
     216where (h_sedimmy(:,:).le.seuil_sedim) 
     217  betamy(:,:)= beta_slope*(neffmy(:,:)**beta_expo) 
     218elsewhere 
     219  betamy(:,:)= beta_slope*(neffmy(:,:)**beta_expo) * coef_sedim 
     220endwhere 
     221!where (h_sedimmx(:,:).gt.seuil_sedim) betamx(:,:) = beta_slope*(neffmin**beta_expo)/neffmin 
     222!where (h_sedimmy(:,:).gt.seuil_sedim) betamy(:,:) = beta_slope*(neffmin**beta_expo)/neffmin 
    213223 
    214224where (ilemx(:,:)) betamx(:,:) = betamx(:,:) * coef_ile 
    215225where (ilemy(:,:)) betamy(:,:) = betamy(:,:) * coef_ile 
    216  
    217 where (h_sedimmx(:,:).gt.seuil_sedim) betamx(:,:) = betamx(:,:) * coef_sedim 
    218 where (h_sedimmy(:,:).gt.seuil_sedim) betamy(:,:) = betamy(:,:) * coef_sedim 
    219 !where (h_sedimmx(:,:).gt.seuil_sedim) betamx(:,:) = beta_slope*(neffmin**beta_expo)/neffmin 
    220 !where (h_sedimmy(:,:).gt.seuil_sedim) betamy(:,:) = beta_slope*(neffmin**beta_expo)/neffmin 
    221226 
    222227betamx(:,:)=max(betamx(:,:),betamin) 
    … …  
    263268flgzmy(:,:) = flgzmy(:,:) .or. gzmy(:,:) 
    264269 
    265 where (hmx(:,:).eq.0.) 
    266   flgzmx(:,:) = .false. 
    267 endwhere 
    268 where (hmy(:,:).eq.0.) 
    269   flgzmy(:,:) = .false. 
    270 endwhere 
    271  
    272270fleuvemx(:,:)=gzmx(:,:) 
    273271fleuvemy(:,:)=gzmy(:,:) 
Note: See TracChangeset for help on using the changeset viewer.