Changeset 7435 for branches/2016/dev_merge_2016
- Timestamp:
- 2016-12-02T11:53:26+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90
r7434 r7435 410 410 tsn(:,:,:,jp_sal) = 35._wp 411 411 tsb(:,:,:,jp_sal) = 35._wp 412 SELECT CASE ( jp_cfg )412 SELECT CASE ( nn_cfg ) 413 413 ! ! ==================== 414 414 CASE ( 1 ) ! WAD 1 configuration … … 420 420 ! 421 421 do ji = 1,jpi 422 sshn(ji,:) = ( -5.5_wp + 5.5_wp*FLOAT(mig(ji))/FLOAT(jpi dta-1))*tmask(ji,:,1)422 sshn(ji,:) = ( -5.5_wp + 5.5_wp*FLOAT(mig(ji))/FLOAT(jpiglo-1))*tmask(ji,:,1) 423 423 end do 424 424 ! ! ==================== … … 431 431 ! 432 432 do ji = 1,jpi 433 sshn(ji,:) = ( -5.5_wp + 3.9_wp*FLOAT(jpi dta - mig(ji))/FLOAT(jpidta-1))*tmask(ji,:,1)433 sshn(ji,:) = ( -5.5_wp + 3.9_wp*FLOAT(jpiglo - mig(ji))/FLOAT(jpiglo-1))*tmask(ji,:,1) 434 434 end do 435 435 ! ! ==================== … … 442 442 ! 443 443 do ji = 1,jpi 444 sshn(ji,:) = ( -7.5_wp + 6.9_wp*FLOAT(jpi dta - mig(ji))/FLOAT(jpidta-1))*tmask(ji,:,1)444 sshn(ji,:) = ( -7.5_wp + 6.9_wp*FLOAT(jpiglo - mig(ji))/FLOAT(jpiglo-1))*tmask(ji,:,1) 445 445 end do 446 446 … … 473 473 ! Needed rn_wdmin2 increased to 0.01 for this case? 474 474 do ji = 1,jpi 475 sshn(ji,:) = ( -5.5_wp + 9.0_wp*FLOAT(mig(ji))/FLOAT(jpi dta-1))*tmask(ji,:,1)475 sshn(ji,:) = ( -5.5_wp + 9.0_wp*FLOAT(mig(ji))/FLOAT(jpiglo-1))*tmask(ji,:,1) 476 476 end do 477 477 … … 487 487 do ji = 1,jpi 488 488 !6a 489 sshn(ji,:) = ( -5.5_wp + 9.0_wp*FLOAT(jpi dta - mig(ji))/FLOAT(jpidta-1))*tmask(ji,:,1)489 sshn(ji,:) = ( -5.5_wp + 9.0_wp*FLOAT(jpiglo - mig(ji))/FLOAT(jpiglo-1))*tmask(ji,:,1) 490 490 !Some variations in initial slope that have been tested 491 491 !6b 492 !sshn(ji,:) = ( -5.5_wp + 6.5_wp*FLOAT(jpi dta - mig(ji))/FLOAT(jpidta-1))*tmask(ji,:,1)492 !sshn(ji,:) = ( -5.5_wp + 6.5_wp*FLOAT(jpiglo - mig(ji))/FLOAT(jpiglo-1))*tmask(ji,:,1) 493 493 !6c 494 !sshn(ji,:) = ( -5.5_wp + 7.5_wp*FLOAT(jpi dta - mig(ji))/FLOAT(jpidta-1))*tmask(ji,:,1)494 !sshn(ji,:) = ( -5.5_wp + 7.5_wp*FLOAT(jpiglo - mig(ji))/FLOAT(jpiglo-1))*tmask(ji,:,1) 495 495 !6d 496 !sshn(ji,:) = ( -4.5_wp + 8.0_wp*FLOAT(jpi dta - mig(ji))/FLOAT(jpidta-1))*tmask(ji,:,1)496 !sshn(ji,:) = ( -4.5_wp + 8.0_wp*FLOAT(jpiglo - mig(ji))/FLOAT(jpiglo-1))*tmask(ji,:,1) 497 497 end do 498 498
Note: See TracChangeset
for help on using the changeset viewer.