Changeset 8191 for branches/UKMO/dev_r5518_GO6_package_fix_rnf_MOCI_TEST_SUITE/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90
- Timestamp:
- 2017-06-19T18:16:30+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r5518_GO6_package_fix_rnf_MOCI_TEST_SUITE/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90
r7747 r8191 343 343 ENDIF 344 344 ENDIF 345 <<<<<<< .working 345 346 346 347 IF( iom_use("sopht_vt") .OR. iom_use("sopst_vs") ) THEN … … 433 434 ENDIF 434 435 #endif 436 ======= 437 438 IF( iom_use("sopht_vt") .OR. iom_use("sopst_vs") ) THEN 439 z2d(1,:) = htr_vt(:,1) * rc_pwatt ! (conversion in PW) 440 DO ji = 1, jpi 441 z2d(ji,:) = z2d(1,:) 442 ENDDO 443 cl1 = 'sopht_vt' 444 CALL iom_put( TRIM(cl1), z2d ) 445 z2d(1,:) = str_vs(:,1) * rc_ggram ! (conversion in Gg) 446 DO ji = 1, jpi 447 z2d(ji,:) = z2d(1,:) 448 ENDDO 449 cl1 = 'sopst_vs' 450 CALL iom_put( TRIM(cl1), z2d ) 451 IF( ln_subbas ) THEN 452 DO jn=2,nptr 453 z2d(1,:) = htr_vt(:,jn) * rc_pwatt ! (conversion in PW) 454 DO ji = 1, jpi 455 z2d(ji,:) = z2d(1,:) 456 ENDDO 457 cl1 = TRIM('sopht_vt_'//clsubb(jn)) 458 CALL iom_put( cl1, z2d ) 459 z2d(1,:) = str_vs(:,jn) * rc_ggram ! (conversion in Gg) 460 DO ji = 1, jpi 461 z2d(ji,:) = z2d(1,:) 462 ENDDO 463 cl1 = TRIM('sopst_vs_'//clsubb(jn)) 464 CALL iom_put( cl1, z2d ) 465 ENDDO 466 ENDIF 467 ENDIF 468 469 #ifdef key_diaeiv 470 IF(lk_traldf_eiv) THEN 471 IF( iom_use("sophteiv") .OR. iom_use("sopsteiv") ) THEN 472 z2d(1,:) = htr_eiv(:,1) * rc_pwatt ! (conversion in PW) 473 DO ji = 1, jpi 474 z2d(ji,:) = z2d(1,:) 475 ENDDO 476 cl1 = 'sophteiv' 477 CALL iom_put( TRIM(cl1), z2d ) 478 z2d(1,:) = str_eiv(:,1) * rc_ggram ! (conversion in Gg) 479 DO ji = 1, jpi 480 z2d(ji,:) = z2d(1,:) 481 ENDDO 482 cl1 = 'sopsteiv' 483 CALL iom_put( TRIM(cl1), z2d ) 484 IF( ln_subbas ) THEN 485 DO jn=2,nptr 486 z2d(1,:) = htr_eiv(:,jn) * rc_pwatt ! (conversion in PW) 487 DO ji = 1, jpi 488 z2d(ji,:) = z2d(1,:) 489 ENDDO 490 cl1 = TRIM('sophteiv_'//clsubb(jn)) 491 CALL iom_put( cl1, z2d ) 492 z2d(1,:) = str_eiv(:,jn) * rc_ggram ! (conversion in Gg) 493 DO ji = 1, jpi 494 z2d(ji,:) = z2d(1,:) 495 ENDDO 496 cl1 = TRIM('sopsteiv_'//clsubb(jn)) 497 CALL iom_put( cl1, z2d ) 498 ENDDO 499 ENDIF 500 ENDIF 501 ENDIF 502 #endif 503 >>>>>>> .merge-right.r7923 435 504 ! 436 505 ENDIF
Note: See TracChangeset
for help on using the changeset viewer.