Changeset 11325
- Timestamp:
- 2019-07-23T10:19:17+02:00 (4 years ago)
- Files:
-
- 5 edited
-
NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY/bdydta.F90 (modified) (10 diffs)
-
NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/DIA/diawri.F90 (modified) (3 diffs)
-
NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/TRA/eosbn2.F90 (modified) (3 diffs)
-
utils/build/arch/CNRS/arch-X64_IRENE_DEBUG.fcm (modified) (1 diff)
-
utils/build/arch/arch-osx_gfortran_debug.fcm (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY/bdydta.F90
r11317 r11325 415 415 bf_alias => bf(jp_bdyssh,jbdy:jbdy) ! alias for ssh structure of bdy number jbdy 416 416 bn_alias => bn_ssh ! alias for ssh structure of nambdy_dta 417 iszdim = idx_bdy(jbdy)%nblenrim(igrd) ! length of this bdy on this MPI processus : only rim 417 418 ENDIF 418 419 ! ===================== … … 427 428 bf_alias => bf(jp_bdyu2d,jbdy:jbdy) ! alias for u2d structure of bdy number jbdy 428 429 bn_alias => bn_u2d ! alias for u2d structure of nambdy_dta 430 iszdim = idx_bdy(jbdy)%nblenrim(igrd) ! length of this bdy on this MPI processus : only rim 429 431 ENDIF 430 432 IF( jfld == jp_bdyv2d ) THEN … … 436 438 bf_alias => bf(jp_bdyv2d,jbdy:jbdy) ! alias for v2d structure of bdy number jbdy 437 439 bn_alias => bn_v2d ! alias for v2d structure of nambdy_dta 440 iszdim = idx_bdy(jbdy)%nblenrim(igrd) ! length of this bdy on this MPI processus : only rim 438 441 ENDIF 439 442 ! ===================== … … 449 452 bf_alias => bf(jp_bdyu3d,jbdy:jbdy) ! alias for u3d structure of bdy number jbdy 450 453 bn_alias => bn_u3d ! alias for u3d structure of nambdy_dta 451 ENDIF 454 iszdim = idx_bdy(jbdy)%nblen(igrd) ! length of this bdy on this MPI processus 455 ENDIF 452 456 IF( jfld == jp_bdyv3d ) THEN 453 457 cl3 = 'v3d' … … 459 463 bf_alias => bf(jp_bdyv3d,jbdy:jbdy) ! alias for v3d structure of bdy number jbdy 460 464 bn_alias => bn_v3d ! alias for v3d structure of nambdy_dta 461 ENDIF 465 iszdim = idx_bdy(jbdy)%nblen(igrd) ! length of this bdy on this MPI processus 466 ENDIF 462 467 463 468 ! ===================== … … 472 477 bf_alias => bf(jp_bdytem,jbdy:jbdy) ! alias for ssh structure of bdy number jbdy 473 478 bn_alias => bn_tem ! alias for ssh structure of nambdy_dta 479 iszdim = idx_bdy(jbdy)%nblen(igrd) ! length of this bdy on this MPI processus 474 480 ENDIF 475 481 IF( jfld == jp_bdysal ) THEN … … 481 487 bf_alias => bf(jp_bdysal,jbdy:jbdy) ! alias for ssh structure of bdy number jbdy 482 488 bn_alias => bn_sal ! alias for ssh structure of nambdy_dta 489 iszdim = idx_bdy(jbdy)%nblen(igrd) ! length of this bdy on this MPI processus 483 490 ENDIF 484 491 … … 494 501 bf_alias => bf(jp_bdya_i,jbdy:jbdy) ! alias for ssh structure of bdy number jbdy 495 502 bn_alias => bn_a_i ! alias for ssh structure of nambdy_dta 496 ENDIF 503 iszdim = idx_bdy(jbdy)%nblen(igrd) ! length of this bdy on this MPI processus 504 ENDIF 497 505 IF( jfld == jp_bdyh_i ) THEN 498 506 cl3 = 'h_i' … … 503 511 bf_alias => bf(jp_bdyh_i,jbdy:jbdy) ! alias for ssh structure of bdy number jbdy 504 512 bn_alias => bn_h_i ! alias for ssh structure of nambdy_dta 513 iszdim = idx_bdy(jbdy)%nblen(igrd) ! length of this bdy on this MPI processus 505 514 ENDIF 506 515 IF( jfld == jp_bdyh_s ) THEN … … 512 521 bf_alias => bf(jp_bdyh_s,jbdy:jbdy) ! alias for ssh structure of bdy number jbdy 513 522 bn_alias => bn_h_s ! alias for ssh structure of nambdy_dta 514 ENDIF515 523 iszdim = idx_bdy(jbdy)%nblen(igrd) ! length of this bdy on this MPI processus 524 ENDIF 516 525 517 526 IF( llneed ) THEN ! dta_bdy(jbdy)%xxx will be needed 518 527 ! ! -> must be associated with an allocated target 519 iszdim = idx_bdy(jbdy)%nblen(igrd) ! length of this bdy on this MPI processus520 528 ALLOCATE( bf_alias(1)%fnow( iszdim, 1, ipk ) ) ! allocate the target 521 529 ! -
NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/DIA/diawri.F90
r10425 r11325 657 657 ENDIF 658 658 659 IF( .NOT. ln_cpl) THEN659 IF( ln_ssr ) THEN 660 660 CALL histdef( nid_T, "sohefldp", "Surface Heat Flux: Damping" , "W/m2" , & ! qrp 661 661 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) … … 665 665 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) 666 666 ENDIF 667 668 IF( ln_cpl .AND. nn_ice <= 1 ) THEN 669 CALL histdef( nid_T, "sohefldp", "Surface Heat Flux: Damping" , "W/m2" , & ! qrp 670 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) 671 CALL histdef( nid_T, "sowafldp", "Surface Water Flux: Damping" , "Kg/m2/s", & ! erp 672 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) 673 CALL histdef( nid_T, "sosafldp", "Surface salt flux: Damping" , "Kg/m2/s", & ! erp * sn 674 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) 675 ENDIF 676 667 677 668 clmx ="l_max(only(x))" ! max index on a period 678 669 ! CALL histdef( nid_T, "sobowlin", "Bowl Index" , "W-point", & ! bowl INDEX … … 814 805 ENDIF 815 806 816 IF( .NOT. ln_cpl) THEN807 IF( ln_ssr ) THEN 817 808 CALL histwrite( nid_T, "sohefldp", it, qrp , ndim_hT, ndex_hT ) ! heat flux damping 818 809 CALL histwrite( nid_T, "sowafldp", it, erp , ndim_hT, ndex_hT ) ! freshwater flux damping 819 IF( ln_ssr ) zw2d(:,:) = erp(:,:) * tsn(:,:,1,jp_sal) * tmask(:,:,1) 820 CALL histwrite( nid_T, "sosafldp", it, zw2d , ndim_hT, ndex_hT ) ! salt flux damping 821 ENDIF 822 IF( ln_cpl .AND. nn_ice <= 1 ) THEN 823 CALL histwrite( nid_T, "sohefldp", it, qrp , ndim_hT, ndex_hT ) ! heat flux damping 824 CALL histwrite( nid_T, "sowafldp", it, erp , ndim_hT, ndex_hT ) ! freshwater flux damping 825 IF( ln_ssr ) zw2d(:,:) = erp(:,:) * tsn(:,:,1,jp_sal) * tmask(:,:,1) 810 zw2d(:,:) = erp(:,:) * tsn(:,:,1,jp_sal) * tmask(:,:,1) 826 811 CALL histwrite( nid_T, "sosafldp", it, zw2d , ndim_hT, ndex_hT ) ! salt flux damping 827 812 ENDIF -
NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/TRA/eosbn2.F90
r11317 r11325 30 30 !! eos_insitu_2d : Compute the in situ density for 2d fields 31 31 !! bn2 : Compute the Brunt-Vaisala frequency 32 !! bn2 : compute the Brunt-Vaisala frequency 33 !! eos_pt_from_ct: compute the potential temperature from the Conservative Temperature 32 34 !! eos_rab : generic interface of in situ thermal/haline expansion ratio 33 35 !! eos_rab_3d : compute in situ thermal/haline expansion ratio … … 74 76 75 77 ! !!** Namelist nameos ** 76 LOGICAL , PUBLIC :: ln_TEOS10 ! determine if eos_pt_from_ct is used to compute sst_m77 LOGICAL , PUBLIC :: ln_EOS80 ! determine if eos_pt_from_ct is used to compute sst_m78 LOGICAL , PUBLIC :: ln_SEOS ! determine if eos_pt_from_ct is used to compute sst_m78 LOGICAL , PUBLIC :: ln_TEOS10 79 LOGICAL , PUBLIC :: ln_EOS80 80 LOGICAL , PUBLIC :: ln_SEOS 79 81 80 82 ! Parameters … … 1647 1649 ! 1648 1650 CASE( np_seos ) !== Simplified EOS ==! 1651 1652 r1_S0 = 0.875_wp/35.16504_wp ! Used to convert CT in potential temperature when using bulk formulae (eos_pt_from_ct) 1653 1649 1654 IF(lwp) THEN 1650 1655 WRITE(numout,*) -
utils/build/arch/CNRS/arch-X64_IRENE_DEBUG.fcm
r10339 r11325 44 44 %CPP cpp 45 45 %FC mpif90 -c -cpp 46 %FCFLAGS -i4 -r8 -g -O0 -debug all -traceback -fp-model precise -ftrapuv -fpe0 46 %FCFLAGS -i4 -r8 -g -O0 -debug all -traceback -fp-model precise -ftrapuv -fpe0 -check bounds 47 47 %FFLAGS %FCFLAGS 48 48 %LD mpif90 -
utils/build/arch/arch-osx_gfortran_debug.fcm
r10533 r11325 42 42 %NCDF_HOME /opt/local 43 43 %HDF5_HOME /opt/local 44 %XIOS_HOME /Users/$( whoami )/xios-2. 044 %XIOS_HOME /Users/$( whoami )/xios-2.5 45 45 %OASIS_HOME /not/defined 46 46 … … 54 54 %CPP cpp-mp-4.8 -Dkey_nosignedzero 55 55 %FC mpif90 56 #%FCFLAGS -fdefault-real-8 -O3 -funroll-all-loops -fcray-pointer -ffree-line-length-none -fbounds-check 57 %FCFLAGS -fdefault-real-8 -O0 -funroll-all-loops -fcray-pointer -ffree-line-length-none -fcheck=bounds -finit-real=nan 56 %FCFLAGS -fdefault-real-8 -O0 -g -fbacktrace -funroll-all-loops -fcray-pointer -ffree-line-length-none -fcheck=bounds -finit-real=nan 58 57 %FFLAGS %FCFLAGS 59 58 %LD %FC
Note: See TracChangeset
for help on using the changeset viewer.
