Changeset 9570 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC
- Timestamp:
- 2018-05-11T12:53:25+02:00 (6 years ago)
- Location:
- branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC
- Files:
-
- 3 edited
- 5 moved
Legend:
- Unmodified
- Added
- Removed
-
branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_ice.F90
r9019 r9570 7 7 !! 3.6 ! 2016-05 (C. Rousset) Add LIM3 compatibility 8 8 !!---------------------------------------------------------------------- 9 #if defined key_agrif && defined key_ lim39 #if defined key_agrif && defined key_si3 10 10 !!---------------------------------------------------------------------- 11 11 !! 'key_agrif' AGRIF zoom 12 !! 'key_ lim3' LIM3 sea-ice model12 !! 'key_si3' SI3 sea-ice model 13 13 !!---------------------------------------------------------------------- 14 14 IMPLICIT NONE -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_oce_interp.F90
r9565 r9570 1 MODULE agrif_o pa_interp1 MODULE agrif_oce_interp 2 2 !!====================================================================== 3 !! *** MODULE agrif_o pa_interp ***3 !! *** MODULE agrif_oce_interp *** 4 4 !! AGRIF: interpolation package for the ocean dynamics (OPA) 5 5 !!====================================================================== … … 31 31 ! 32 32 USE in_out_manager 33 USE agrif_o pa_sponge33 USE agrif_oce_sponge 34 34 USE lib_mpp 35 35 … … 1406 1406 !!---------------------------------------------------------------------- 1407 1407 CONTAINS 1408 SUBROUTINE Agrif_O PA_Interp_empty1409 WRITE(*,*) 'agrif_o pa_interp : You should not have seen this print! error?'1410 END SUBROUTINE Agrif_O PA_Interp_empty1408 SUBROUTINE Agrif_OCE_Interp_empty 1409 WRITE(*,*) 'agrif_oce_interp : You should not have seen this print! error?' 1410 END SUBROUTINE Agrif_OCE_Interp_empty 1411 1411 #endif 1412 1412 1413 1413 !!====================================================================== 1414 END MODULE agrif_o pa_interp1414 END MODULE agrif_oce_interp -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_oce_sponge.F90
r9565 r9570 1 1 #define SPONGE && define SPONGE_TOP 2 2 3 MODULE agrif_o pa_sponge3 MODULE agrif_oce_sponge 4 4 !!====================================================================== 5 !! *** MODULE agrif_o pa_interp ***5 !! *** MODULE agrif_oce_interp *** 6 6 !! AGRIF: sponge package for the ocean dynamics (OPA) 7 7 !!====================================================================== … … 611 611 !!---------------------------------------------------------------------- 612 612 CONTAINS 613 SUBROUTINE agrif_o pa_sponge_empty614 WRITE(*,*) 'agrif_o pa_sponge : You should not have seen this print! error?'615 END SUBROUTINE agrif_o pa_sponge_empty613 SUBROUTINE agrif_oce_sponge_empty 614 WRITE(*,*) 'agrif_oce_sponge : You should not have seen this print! error?' 615 END SUBROUTINE agrif_oce_sponge_empty 616 616 #endif 617 617 618 618 !!====================================================================== 619 END MODULE agrif_o pa_sponge619 END MODULE agrif_oce_sponge -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_oce_update.F90
r9565 r9570 3 3 #undef VOL_REFLUX /* VOLUME REFLUXING*/ 4 4 5 MODULE agrif_o pa_update5 MODULE agrif_oce_update 6 6 !!====================================================================== 7 !! *** MODULE agrif_o pa_interp ***7 !! *** MODULE agrif_oce_interp *** 8 8 !! AGRIF: update package for the ocean dynamics (OPA) 9 9 !!====================================================================== … … 1412 1412 !!---------------------------------------------------------------------- 1413 1413 CONTAINS 1414 SUBROUTINE agrif_o pa_update_empty1415 WRITE(*,*) 'agrif_o pa_update : You should not have seen this print! error?'1416 END SUBROUTINE agrif_o pa_update_empty1414 SUBROUTINE agrif_oce_update_empty 1415 WRITE(*,*) 'agrif_oce_update : You should not have seen this print! error?' 1416 END SUBROUTINE agrif_oce_update_empty 1417 1417 #endif 1418 1418 1419 1419 !!====================================================================== 1420 END MODULE agrif_o pa_update1421 1420 END MODULE agrif_oce_update 1421 -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_si3_interp.F90
r9565 r9570 1 MODULE agrif_ lim3_interp1 MODULE agrif_si3_interp 2 2 !!===================================================================================== 3 !! *** MODULE agrif_ lim3_interp ***3 !! *** MODULE agrif_si3_interp *** 4 4 !! Nesting module : interp surface ice boundary condition from a parent grid 5 5 !! Sea-Ice model : LIM 3.6 Sea ice model time-stepping … … 9 9 !! 3.6 ! 05-2016 (C. Rousset) Add LIM3 compatibility 10 10 !!---------------------------------------------------------------------- 11 #if defined key_agrif && defined key_ lim312 !!---------------------------------------------------------------------- 13 !! 'key_ lim3' : LIM 3.6 sea-ice model11 #if defined key_agrif && defined key_si3 12 !!---------------------------------------------------------------------- 13 !! 'key_si3' : LIM 3.6 sea-ice model 14 14 !! 'key_agrif' : AGRIF library 15 15 !!---------------------------------------------------------------------- 16 !! agrif_interp_ lim3 : interpolation of ice at "after" sea-ice time step16 !! agrif_interp_si3 : interpolation of ice at "after" sea-ice time step 17 17 !! agrif_interp_u_ice : atomic routine to interpolate u_ice 18 18 !! agrif_interp_v_ice : atomic routine to interpolate v_ice … … 29 29 PRIVATE 30 30 31 PUBLIC agrif_interp_ lim3 ! called by agrif_user.F9031 PUBLIC agrif_interp_si3 ! called by agrif_user.F90 32 32 33 33 !!---------------------------------------------------------------------- 34 34 !! NEMO/NST 3.6 , NEMO Consortium (2016) 35 !! $Id: agrif_ lim3_interp.F90 6204 2016-01-04 13:47:06Z cetlod $35 !! $Id: agrif_si3_interp.F90 6204 2016-01-04 13:47:06Z cetlod $ 36 36 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 37 37 !!---------------------------------------------------------------------- … … 39 39 CONTAINS 40 40 41 SUBROUTINE agrif_interp_ lim3( cd_type, kiter, kitermax )41 SUBROUTINE agrif_interp_si3( cd_type, kiter, kitermax ) 42 42 !!----------------------------------------------------------------------- 43 43 !! *** ROUTINE agrif_rhg_lim3 *** … … 77 77 Agrif_UseSpecialValue = .FALSE. 78 78 ! 79 END SUBROUTINE agrif_interp_ lim379 END SUBROUTINE agrif_interp_si3 80 80 81 81 … … 371 371 !!---------------------------------------------------------------------- 372 372 CONTAINS 373 SUBROUTINE agrif_ lim3_interp_empty374 WRITE(*,*) 'agrif_ lim3_interp : You should not have seen this print! error?'375 END SUBROUTINE agrif_ lim3_interp_empty373 SUBROUTINE agrif_si3_interp_empty 374 WRITE(*,*) 'agrif_si3_interp : You should not have seen this print! error?' 375 END SUBROUTINE agrif_si3_interp_empty 376 376 #endif 377 377 378 378 !!====================================================================== 379 END MODULE agrif_ lim3_interp379 END MODULE agrif_si3_interp -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_si3_update.F90
r9565 r9570 2 2 !!#undef TWO_WAY 3 3 4 MODULE agrif_ lim3_update4 MODULE agrif_si3_update 5 5 !!===================================================================================== 6 !! *** MODULE agrif_ lim3_update ***6 !! *** MODULE agrif_si3_update *** 7 7 !! Nesting module : update surface ocean boundary condition over ice from a child grid 8 8 !! Sea-Ice model : LIM 3.6 Sea ice model time-stepping … … 12 12 !! 3.6 ! 05-2016 (C. Rousset) Add LIM3 compatibility 13 13 !!---------------------------------------------------------------------- 14 #if defined key_agrif && defined key_ lim315 !!---------------------------------------------------------------------- 16 !! 'key_ lim3' : LIM 3.6 sea-ice model14 #if defined key_agrif && defined key_si3 15 !!---------------------------------------------------------------------- 16 !! 'key_si3' : LIM 3.6 sea-ice model 17 17 !! 'key_agrif' : AGRIF library 18 18 !!---------------------------------------------------------------------- 19 !! agrif_update_ lim3 : update sea-ice on boundaries or total19 !! agrif_update_si3 : update sea-ice on boundaries or total 20 20 !! child domain for velocities and ice properties 21 21 !! update_tra_ice : sea-ice properties … … 33 33 PRIVATE 34 34 35 PUBLIC agrif_update_ lim3 ! called by agrif_user.F90 and icestp.F9035 PUBLIC agrif_update_si3 ! called by agrif_user.F90 and icestp.F90 36 36 37 37 !!---------------------------------------------------------------------- 38 38 !! NEMO/NST 4.0 , LOCEAN-IPSL (2017) 39 !! $Id: agrif_ lim3_update.F90 6204 2016-01-04 13:47:06Z cetlod $39 !! $Id: agrif_si3_update.F90 6204 2016-01-04 13:47:06Z cetlod $ 40 40 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 41 41 !!---------------------------------------------------------------------- 42 42 CONTAINS 43 43 44 SUBROUTINE agrif_update_ lim3( kt )44 SUBROUTINE agrif_update_si3( kt ) 45 45 !!---------------------------------------------------------------------- 46 !! *** ROUTINE agrif_update_ lim3 ***46 !! *** ROUTINE agrif_update_si3 *** 47 47 !! ** Method : Call the hydrostaticupdate pressure at the boundary or the entire domain 48 48 !! … … 70 70 Agrif_UseSpecialValueInUpdate = .FALSE. 71 71 ! 72 END SUBROUTINE agrif_update_ lim372 END SUBROUTINE agrif_update_si3 73 73 74 74 … … 210 210 !!---------------------------------------------------------------------- 211 211 CONTAINS 212 SUBROUTINE agrif_ lim3_update_empty213 WRITE(*,*) 'agrif_ lim3_update : You should not have seen this print! error?'214 END SUBROUTINE agrif_ lim3_update_empty212 SUBROUTINE agrif_si3_update_empty 213 WRITE(*,*) 'agrif_si3_update : You should not have seen this print! error?' 214 END SUBROUTINE agrif_si3_update_empty 215 215 #endif 216 216 217 217 !!====================================================================== 218 END MODULE agrif_ lim3_update218 END MODULE agrif_si3_update -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_top_sponge.F90
r9056 r9570 19 19 USE dom_oce 20 20 USE agrif_oce 21 USE agrif_o pa_sponge21 USE agrif_oce_sponge 22 22 ! 23 23 USE in_out_manager -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_user.F90
r9482 r9570 61 61 CALL Agrif_InitValues_cont_top 62 62 # endif 63 # if defined key_ lim364 CALL Agrif_InitValues_cont_ lim363 # if defined key_si3 64 CALL Agrif_InitValues_cont_si3 65 65 # endif 66 66 ! … … 83 83 USE nemogcm 84 84 USE in_out_manager 85 USE agrif_o pa_update86 USE agrif_o pa_interp87 USE agrif_o pa_sponge85 USE agrif_oce_update 86 USE agrif_oce_interp 87 USE agrif_oce_sponge 88 88 ! 89 89 IMPLICIT NONE … … 149 149 !! ** Purpose :: Declaration of variables to be interpolated 150 150 !!---------------------------------------------------------------------- 151 USE agrif_o pa_update152 USE agrif_o pa_interp153 USE agrif_o pa_sponge151 USE agrif_oce_update 152 USE agrif_oce_interp 153 USE agrif_oce_sponge 154 154 USE Agrif_Util 155 155 USE oce … … 303 303 !!---------------------------------------------------------------------- 304 304 USE dom_oce 305 USE agrif_o pa_update305 USE agrif_oce_update 306 306 #if defined key_top 307 307 USE agrif_top_update 308 308 #endif 309 #if defined key_ lim3310 USE agrif_ lim3_update309 #if defined key_si3 310 USE agrif_si3_update 311 311 #endif 312 312 ! … … 326 326 !! CALL Agrif_Update_tke(0) 327 327 328 #if defined key_ lim3329 CALL agrif_update_ lim3(0)328 #if defined key_si3 329 CALL agrif_update_si3(0) 330 330 #endif 331 331 … … 492 492 END SUBROUTINE agrif_declare_var 493 493 494 #if defined key_ lim3495 SUBROUTINE Agrif_InitValues_cont_ lim3496 !!---------------------------------------------------------------------- 497 !! *** ROUTINE Agrif_InitValues_cont_ lim3 ***494 #if defined key_si3 495 SUBROUTINE Agrif_InitValues_cont_si3 496 !!---------------------------------------------------------------------- 497 !! *** ROUTINE Agrif_InitValues_cont_si3 *** 498 498 !! 499 499 !! ** Purpose :: Initialisation of variables to be interpolated for LIM3 … … 504 504 USE agrif_ice 505 505 USE in_out_manager 506 USE agrif_ lim3_interp506 USE agrif_si3_interp 507 507 USE lib_mpp 508 508 ! … … 512 512 ! Declaration of the type of variable which have to be interpolated (parent=>child) 513 513 !---------------------------------------------------------------------------------- 514 CALL agrif_declare_var_ lim3514 CALL agrif_declare_var_si3 515 515 516 516 ! Controls … … 529 529 !---------------------------------------------------------------------- 530 530 lim_nbstep = ( Agrif_irhot() * Agrif_Parent(nn_fsbc) / nn_fsbc ) ! clem: to have calledweight=1 in interp (otherwise the western border of the zoom is wrong) 531 CALL agrif_interp_ lim3('U') ! interpolation of ice velocities532 CALL agrif_interp_ lim3('V') ! interpolation of ice velocities533 CALL agrif_interp_ lim3('T') ! interpolation of ice tracers531 CALL agrif_interp_si3('U') ! interpolation of ice velocities 532 CALL agrif_interp_si3('V') ! interpolation of ice velocities 533 CALL agrif_interp_si3('T') ! interpolation of ice tracers 534 534 lim_nbstep = 0 535 535 536 536 ! 537 END SUBROUTINE Agrif_InitValues_cont_ lim3538 539 SUBROUTINE agrif_declare_var_ lim3540 !!---------------------------------------------------------------------- 541 !! *** ROUTINE agrif_declare_var_ lim3 ***537 END SUBROUTINE Agrif_InitValues_cont_si3 538 539 SUBROUTINE agrif_declare_var_si3 540 !!---------------------------------------------------------------------- 541 !! *** ROUTINE agrif_declare_var_si3 *** 542 542 !! 543 543 !! ** Purpose :: Declaration of variables to be interpolated for LIM3 … … 590 590 #endif 591 591 592 END SUBROUTINE agrif_declare_var_ lim3592 END SUBROUTINE agrif_declare_var_si3 593 593 #endif 594 594 … … 609 609 USE trc 610 610 USE in_out_manager 611 USE agrif_o pa_sponge611 USE agrif_oce_sponge 612 612 USE agrif_top_update 613 613 USE agrif_top_interp
Note: See TracChangeset
for help on using the changeset viewer.