Changeset 14227 for NEMO/trunk/src/OCE
- Timestamp:
- 2020-12-20T12:57:00+01:00 (4 years ago)
- Location:
- NEMO/trunk/src/OCE
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/trunk/src/OCE/C1D/step_c1d.F90
r14072 r14227 41 41 !! 42 42 !! ** Purpose : - Time stepping of SBC including sea ice (dynamic and thermodynamic eqs.) 43 !! - Time stepping of O PA(momentum and active tracer eqs.)43 !! - Time stepping of OCE (momentum and active tracer eqs.) 44 44 !! - Time stepping of TOP (passive tracer eqs.) 45 45 !! -
NEMO/trunk/src/OCE/DYN/dynhpg.F90
r14143 r14227 419 419 IF(lwp) WRITE(numout,*) 420 420 IF(lwp) WRITE(numout,*) 'dyn:hpg_sco : hydrostatic pressure gradient trend' 421 IF(lwp) WRITE(numout,*) '~~~~~~~~~~~ s-coordinate case, O PAoriginal scheme used'421 IF(lwp) WRITE(numout,*) '~~~~~~~~~~~ s-coordinate case, OCE original scheme used' 422 422 ENDIF 423 423 ! -
NEMO/trunk/src/OCE/SBC/cpl_oasis3.F90
r14072 r14227 115 115 116 116 !------------------------------------------------------------------ 117 ! 3rd Get an MPI communicator for O PAlocal communication117 ! 3rd Get an MPI communicator for OCE local communication 118 118 !------------------------------------------------------------------ 119 119 -
NEMO/trunk/src/OCE/SBC/sbc_oce.F90
r14072 r14227 87 87 INTEGER , PUBLIC, PARAMETER :: jp_abl = 4 !: Atmospheric boundary layer formulation 88 88 INTEGER , PUBLIC, PARAMETER :: jp_purecpl = 5 !: Pure ocean-atmosphere Coupled formulation 89 INTEGER , PUBLIC, PARAMETER :: jp_none = 6 !: for O PAwhen doing coupling via SAS module89 INTEGER , PUBLIC, PARAMETER :: jp_none = 6 !: for OCE when doing coupling via SAS module 90 90 ! 91 91 !!---------------------------------------------------------------------- … … 94 94 INTEGER , PUBLIC, PARAMETER :: jp_iam_nemo = 0 !: Initial single executable configuration 95 95 ! (no internal OASIS coupling) 96 INTEGER , PUBLIC, PARAMETER :: jp_iam_o pa = 1 !: Multi executable configuration - OPAcomponent96 INTEGER , PUBLIC, PARAMETER :: jp_iam_oce = 1 !: Multi executable configuration - OCE component 97 97 ! (internal OASIS coupling) 98 98 INTEGER , PUBLIC, PARAMETER :: jp_iam_sas = 2 !: Multi executable configuration - SAS component -
NEMO/trunk/src/OCE/SBC/sbccpl.F90
r14100 r14227 157 157 INTEGER, PARAMETER :: jps_rnf = 24 ! runoffs 158 158 INTEGER, PARAMETER :: jps_taum = 25 ! wind stress module 159 INTEGER, PARAMETER :: jps_fice2 = 26 ! ice fraction sent to O PA (by SAS when doing SAS-OPAcoupling)159 INTEGER, PARAMETER :: jps_fice2 = 26 ! ice fraction sent to OCE (by SAS when doing SAS-OCE coupling) 160 160 INTEGER, PARAMETER :: jps_e3t1st = 27 ! first level depth (vvl) 161 161 INTEGER, PARAMETER :: jps_fraqsr = 28 ! fraction of solar net radiation absorbed in the first ocean level … … 706 706 ! 707 707 ! ! ------------------------------- ! 708 ! ! O PA-SAS coupling - rcv by opa !708 ! ! OCE-SAS coupling - rcv by opa ! 709 709 ! ! ------------------------------- ! 710 710 srcv(jpr_sflx)%clname = 'O_SFLX' 711 711 srcv(jpr_fice)%clname = 'RIceFrc' 712 712 ! 713 IF( nn_components == jp_iam_o pa ) THEN ! OPA coupled to SAS via OASIS: force received field by OPA(sent by SAS)713 IF( nn_components == jp_iam_oce ) THEN ! OCE coupled to SAS via OASIS: force received field by OCE (sent by SAS) 714 714 srcv(:)%laction = .FALSE. ! force default definition in case of opa <-> sas coupling 715 715 srcv(:)%clgrid = 'T' ! force default definition in case of opa <-> sas coupling … … 727 727 IF(lwp) THEN ! control print 728 728 WRITE(numout,*) 729 WRITE(numout,*)' Special conditions for SAS-O PAcoupling '730 WRITE(numout,*)' O PAcomponent '729 WRITE(numout,*)' Special conditions for SAS-OCE coupling ' 730 WRITE(numout,*)' OCE component ' 731 731 WRITE(numout,*) 732 732 WRITE(numout,*)' received fields from SAS component ' … … 742 742 ENDIF 743 743 ! ! -------------------------------- ! 744 ! ! O PA-SAS coupling - rcv by sas !744 ! ! OCE-SAS coupling - rcv by sas ! 745 745 ! ! -------------------------------- ! 746 746 srcv(jpr_toce )%clname = 'I_SSTSST' … … 762 762 ! Vectors: change of sign at north fold ONLY if on the local grid 763 763 srcv(jpr_ocx1:jpr_ocy1)%nsgn = -1. 764 ! Change first letter to couple with atmosphere if already coupled O PA764 ! Change first letter to couple with atmosphere if already coupled OCE 765 765 ! this is nedeed as each variable name used in the namcouple must be unique: 766 ! for example O_Runoff received by O PAfrom SAS and therefore S_Runoff received by SAS from the Atmosphere766 ! for example O_Runoff received by OCE from SAS and therefore S_Runoff received by SAS from the Atmosphere 767 767 DO jn = 1, jprcv 768 768 IF( srcv(jn)%clname(1:1) == "O" ) srcv(jn)%clname = "S"//srcv(jn)%clname(2:LEN(srcv(jn)%clname)) … … 771 771 IF(lwp) THEN ! control print 772 772 WRITE(numout,*) 773 WRITE(numout,*)' Special conditions for SAS-O PAcoupling '773 WRITE(numout,*)' Special conditions for SAS-OCE coupling ' 774 774 WRITE(numout,*)' SAS component ' 775 775 WRITE(numout,*) 776 776 IF( .NOT. ln_cpl ) THEN 777 WRITE(numout,*)' received fields from O PAcomponent '777 WRITE(numout,*)' received fields from OCE component ' 778 778 ELSE 779 WRITE(numout,*)' Additional received fields from O PAcomponent : '779 WRITE(numout,*)' Additional received fields from OCE component : ' 780 780 ENDIF 781 781 WRITE(numout,*)' sea surface temperature (Celsius) ' … … 1028 1028 1029 1029 ! ! ------------------------------- ! 1030 ! ! O PA-SAS coupling - snd by opa !1030 ! ! OCE-SAS coupling - snd by opa ! 1031 1031 ! ! ------------------------------- ! 1032 1032 ssnd(jps_ssh )%clname = 'O_SSHght' … … 1035 1035 ssnd(jps_fraqsr)%clname = 'O_FraQsr' 1036 1036 ! 1037 IF( nn_components == jp_iam_o pa) THEN1037 IF( nn_components == jp_iam_oce ) THEN 1038 1038 ssnd(:)%laction = .FALSE. ! force default definition in case of opa <-> sas coupling 1039 1039 ssnd( (/jps_toce, jps_soce, jps_ssh, jps_fraqsr, jps_ocx1, jps_ocy1/) )%laction = .TRUE. … … 1059 1059 ENDIF 1060 1060 ! ! ------------------------------- ! 1061 ! ! O PA-SAS coupling - snd by sas !1061 ! ! OCE-SAS coupling - snd by sas ! 1062 1062 ! ! ------------------------------- ! 1063 1063 ssnd(jps_sflx )%clname = 'I_SFLX' … … 1077 1077 ! Change first letter to couple with atmosphere if already coupled with sea_ice 1078 1078 ! this is nedeed as each variable name used in the namcouple must be unique: 1079 ! for example O_SSTSST sent by O PAto SAS and therefore S_SSTSST sent by SAS to the Atmosphere1079 ! for example O_SSTSST sent by OCE to SAS and therefore S_SSTSST sent by SAS to the Atmosphere 1080 1080 DO jn = 1, jpsnd 1081 1081 IF( ssnd(jn)%clname(1:1) == "O" ) ssnd(jn)%clname = "S"//ssnd(jn)%clname(2:LEN(ssnd(jn)%clname)) … … 1085 1085 WRITE(numout,*) 1086 1086 IF( .NOT. ln_cpl ) THEN 1087 WRITE(numout,*)' sent fields to O PAcomponent '1087 WRITE(numout,*)' sent fields to OCE component ' 1088 1088 ELSE 1089 WRITE(numout,*)' Additional sent fields to O PAcomponent : '1089 WRITE(numout,*)' Additional sent fields to OCE component : ' 1090 1090 ENDIF 1091 1091 WRITE(numout,*)' ice cover ' … … 1525 1525 ENDIF 1526 1526 ! update qns over the free ocean with: 1527 IF( nn_components /= jp_iam_o pa) THEN1527 IF( nn_components /= jp_iam_oce ) THEN 1528 1528 zqns(:,:) = zqns(:,:) - zemp(:,:) * sst_m(:,:) * rcp ! remove heat content due to mass flux (assumed to be at SST) 1529 1529 IF( srcv(jpr_snow )%laction ) THEN … … 2275 2275 IF( ssnd(jps_toce)%laction .OR. ssnd(jps_tice)%laction .OR. ssnd(jps_tmix)%laction ) THEN 2276 2276 2277 IF( nn_components == jp_iam_o pa) THEN2277 IF( nn_components == jp_iam_oce ) THEN 2278 2278 ztmp1(:,:) = ts(:,:,1,jp_tem,Kmm) ! send temperature as it is (potential or conservative) -> use of l_useCT on the received part 2279 2279 ELSE … … 2427 2427 ENDIF 2428 2428 2429 ! Send ice fraction field to O PA (sent by SAS in SAS-OPAcoupling)2429 ! Send ice fraction field to OCE (sent by SAS in SAS-OCE coupling) 2430 2430 IF( ssnd(jps_fice2)%laction ) THEN 2431 2431 ztmp3(:,:,1) = fr_i(:,:) … … 2543 2543 ! i-1 i i 2544 2544 ! i i+1 (for I) 2545 IF( nn_components == jp_iam_o pa) THEN2545 IF( nn_components == jp_iam_oce ) THEN 2546 2546 zotx1(:,:) = uu(:,:,1,Kmm) 2547 2547 zoty1(:,:) = vv(:,:,1,Kmm) … … 2700 2700 ENDIF 2701 2701 ! 2702 ! Fields sent by O PA to SAS when doing OPA<->SAS coupling2702 ! Fields sent by OCE to SAS when doing OCE<->SAS coupling 2703 2703 ! ! SSH 2704 2704 IF( ssnd(jps_ssh )%laction ) THEN … … 2724 2724 ENDIF 2725 2725 ! 2726 ! Fields sent by SAS to O PAwhen OASIS coupling2726 ! Fields sent by SAS to OCE when OASIS coupling 2727 2727 ! ! Solar heat flux 2728 2728 IF( ssnd(jps_qsroce)%laction ) CALL cpl_snd( jps_qsroce, isec, RESHAPE ( qsr , (/jpi,jpj,1/) ), info ) -
NEMO/trunk/src/OCE/SBC/sbcmod.F90
r14072 r14227 163 163 ! !** check option consistency 164 164 ! 165 IF(lwp) WRITE(numout,*) !* Single / Multi - executable (NEMO / O PA+SAS)165 IF(lwp) WRITE(numout,*) !* Single / Multi - executable (NEMO / OCE+SAS) 166 166 SELECT CASE( nn_components ) 167 167 CASE( jp_iam_nemo ) 168 IF(lwp) WRITE(numout,*) ' ==>>> NEMO configured as a single executable (i.e. including both O PAand Surface module)'169 CASE( jp_iam_o pa)170 IF(lwp) WRITE(numout,*) ' ==>>> Multi executable configuration. Here, O PAcomponent'171 IF( .NOT.lk_oasis ) CALL ctl_stop( 'sbc_init : O PA-SAS coupled via OASIS, but key_oasis3 disabled' )172 IF( ln_cpl ) CALL ctl_stop( 'sbc_init : O PA-SAS coupled via OASIS, but ln_cpl = T in OPA' )173 IF( ln_mixcpl ) CALL ctl_stop( 'sbc_init : O PA-SAS coupled via OASIS, but ln_mixcpl = T in OPA' )168 IF(lwp) WRITE(numout,*) ' ==>>> NEMO configured as a single executable (i.e. including both OCE and Surface module)' 169 CASE( jp_iam_oce ) 170 IF(lwp) WRITE(numout,*) ' ==>>> Multi executable configuration. Here, OCE component' 171 IF( .NOT.lk_oasis ) CALL ctl_stop( 'sbc_init : OCE-SAS coupled via OASIS, but key_oasis3 disabled' ) 172 IF( ln_cpl ) CALL ctl_stop( 'sbc_init : OCE-SAS coupled via OASIS, but ln_cpl = T in OCE' ) 173 IF( ln_mixcpl ) CALL ctl_stop( 'sbc_init : OCE-SAS coupled via OASIS, but ln_mixcpl = T in OCE' ) 174 174 CASE( jp_iam_sas ) 175 175 IF(lwp) WRITE(numout,*) ' ==>>> Multi executable configuration. Here, SAS component' 176 IF( .NOT.lk_oasis ) CALL ctl_stop( 'sbc_init : O PA-SAS coupled via OASIS, but key_oasis3 disabled' )177 IF( ln_mixcpl ) CALL ctl_stop( 'sbc_init : O PA-SAS coupled via OASIS, but ln_mixcpl = T in OPA' )176 IF( .NOT.lk_oasis ) CALL ctl_stop( 'sbc_init : OCE-SAS coupled via OASIS, but key_oasis3 disabled' ) 177 IF( ln_mixcpl ) CALL ctl_stop( 'sbc_init : OCE-SAS coupled via OASIS, but ln_mixcpl = T in OCE' ) 178 178 CASE DEFAULT 179 179 CALL ctl_stop( 'sbc_init : unsupported value for nn_components' ) … … 224 224 ! 225 225 IF( nn_ice == 0 ) THEN !* No sea-ice in the domain : ice fraction is always zero 226 IF( nn_components /= jp_iam_o pa ) fr_i(:,:) = 0._wp ! except for OPA in SAS-OPAcoupled case226 IF( nn_components /= jp_iam_oce ) fr_i(:,:) = 0._wp ! except for OCE in SAS-OCE coupled case 227 227 ENDIF 228 228 ! … … 237 237 IF( ln_dm2dc ) THEN !* daily mean to diurnal cycle 238 238 !LB:nday_qsr = -1 ! allow initialization at the 1st call 239 IF( .NOT.( ln_flx .OR. ln_blk .OR. ln_abl ) .AND. nn_components /= jp_iam_o pa) &239 IF( .NOT.( ln_flx .OR. ln_blk .OR. ln_abl ) .AND. nn_components /= jp_iam_oce ) & 240 240 & CALL ctl_stop( 'qsr diurnal cycle from daily values requires flux, bulk or abl formulation' ) 241 241 ENDIF … … 244 244 ! 245 245 ll_purecpl = ln_cpl .AND. .NOT.ln_mixcpl 246 ll_opa = nn_components == jp_iam_o pa246 ll_opa = nn_components == jp_iam_oce 247 247 ll_not_nemo = nn_components /= jp_iam_nemo 248 248 icpt = 0 … … 266 266 CASE( jp_purecpl ) ; WRITE(numout,*) ' ==>>> pure coupled formulation' 267 267 !!gm abusive use of jp_none ?? ===>>> need to be check and changed by adding a jp_sas parameter 268 CASE( jp_none ) ; WRITE(numout,*) ' ==>>> O PAcoupled to SAS via oasis'268 CASE( jp_none ) ; WRITE(numout,*) ' ==>>> OCE coupled to SAS via oasis' 269 269 IF( ln_mixcpl ) WRITE(numout,*) ' + forced-coupled mixed formulation' 270 270 END SELECT … … 276 276 IF( lk_oasis ) CALL sbc_cpl_init( nn_ice ) ! Must be done before: (1) first time step 277 277 ! ! (2) the use of nn_fsbc 278 ! nn_fsbc initialization if O PA-SAS coupling via OASIS278 ! nn_fsbc initialization if OCE-SAS coupling via OASIS 279 279 ! SAS time-step has to be declared in OASIS (mandatory) -> nn_fsbc has to be modified accordingly 280 280 IF( nn_components /= jp_iam_nemo ) THEN 281 IF( nn_components == jp_iam_o pa) nn_fsbc = cpl_freq('O_SFLX') / NINT(rn_Dt)281 IF( nn_components == jp_iam_oce ) nn_fsbc = cpl_freq('O_SFLX') / NINT(rn_Dt) 282 282 IF( nn_components == jp_iam_sas ) nn_fsbc = cpl_freq('I_SFLX') / NINT(rn_Dt) 283 283 ! 284 284 IF(lwp)THEN 285 285 WRITE(numout,*) 286 WRITE(numout,*)" O PA-SAS coupled via OASIS : nn_fsbc re-defined from OASIS namcouple ", nn_fsbc286 WRITE(numout,*)" OCE-SAS coupled via OASIS : nn_fsbc re-defined from OASIS namcouple ", nn_fsbc 287 287 WRITE(numout,*) 288 288 ENDIF … … 404 404 ! 405 405 ll_sas = nn_components == jp_iam_sas ! component flags 406 ll_opa = nn_components == jp_iam_o pa406 ll_opa = nn_components == jp_iam_oce 407 407 ! 408 408 IF( .NOT.ll_sas ) CALL sbc_ssm ( kt, Kbb, Kmm ) ! mean ocean sea surface variables (sst_m, sss_m, ssu_m, ssv_m) … … 416 416 CASE( jp_flx ) ; CALL sbc_flx ( kt ) ! flux formulation 417 417 CASE( jp_blk ) 418 IF( ll_sas ) CALL sbc_cpl_rcv ( kt, nn_fsbc, nn_ice, Kbb, Kmm ) ! O PA-SAS coupling: SAS receiving fields from OPA418 IF( ll_sas ) CALL sbc_cpl_rcv ( kt, nn_fsbc, nn_ice, Kbb, Kmm ) ! OCE-SAS coupling: SAS receiving fields from OCE 419 419 !!!!!!!!!!! ATTENTION:ln_wave is not only used for oasis coupling !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 420 420 IF( ln_wave ) THEN 421 IF ( lk_oasis ) CALL sbc_cpl_rcv ( kt, nn_fsbc, nn_ice, Kbb, Kmm ) ! O PA-wave coupling421 IF ( lk_oasis ) CALL sbc_cpl_rcv ( kt, nn_fsbc, nn_ice, Kbb, Kmm ) ! OCE-wave coupling 422 422 CALL sbc_wave ( kt, Kmm ) 423 423 ENDIF … … 425 425 ! 426 426 CASE( jp_abl ) 427 IF( ll_sas ) CALL sbc_cpl_rcv ( kt, nn_fsbc, nn_ice, Kbb, Kmm ) ! O PA-SAS coupling: SAS receiving fields from OPA427 IF( ll_sas ) CALL sbc_cpl_rcv ( kt, nn_fsbc, nn_ice, Kbb, Kmm ) ! OCE-SAS coupling: SAS receiving fields from OCE 428 428 CALL sbc_abl ( kt ) ! ABL formulation for the ocean 429 429 ! 430 430 CASE( jp_purecpl ) ; CALL sbc_cpl_rcv ( kt, nn_fsbc, nn_ice, Kbb, Kmm ) ! pure coupled formulation 431 431 CASE( jp_none ) 432 IF( ll_opa ) CALL sbc_cpl_rcv ( kt, nn_fsbc, nn_ice, Kbb, Kmm ) ! O PA-SAS coupling: OPAreceiving fields from SAS432 IF( ll_opa ) CALL sbc_cpl_rcv ( kt, nn_fsbc, nn_ice, Kbb, Kmm ) ! OCE-SAS coupling: OCE receiving fields from SAS 433 433 END SELECT 434 434 ! -
NEMO/trunk/src/OCE/lib_cray.f90
r10070 r14227 1 ! Cray subroutines or functions used by O PAmodel and possibly1 ! Cray subroutines or functions used by OCE model and possibly 2 2 ! not found on other platforms. 3 3 ! -
NEMO/trunk/src/OCE/nemogcm.F90
r14143 r14227 589 589 !! *** ROUTINE nemo_alloc *** 590 590 !! 591 !! ** Purpose : Allocate all the dynamic arrays of the O PAmodules591 !! ** Purpose : Allocate all the dynamic arrays of the OCE modules 592 592 !! 593 593 !! ** Method : -
NEMO/trunk/src/OCE/step.F90
r14203 r14227 42 42 #else 43 43 !!---------------------------------------------------------------------- 44 !! stp : O PAsystem time-stepping44 !! stp : OCE system time-stepping 45 45 !!---------------------------------------------------------------------- 46 46 USE step_oce ! time stepping definition modules … … 73 73 !! *** ROUTINE stp *** 74 74 !! 75 !! ** Purpose : - Time stepping of O PA(momentum and active tracer eqs.)75 !! ** Purpose : - Time stepping of OCE (momentum and active tracer eqs.) 76 76 !! - Time stepping of SI3 (dynamic and thermodynamic eqs.) 77 77 !! - Time stepping of TRC (passive tracer eqs.) -
NEMO/trunk/src/OCE/stpmlf.F90
r14205 r14227 80 80 !! *** ROUTINE stp_MLF *** 81 81 !! 82 !! ** Purpose : - Time stepping of O PA(momentum and active tracer eqs.)82 !! ** Purpose : - Time stepping of OCE (momentum and active tracer eqs.) 83 83 !! - Time stepping of SI3 (dynamic and thermodynamic eqs.) 84 84 !! - Time stepping of TRC (passive tracer eqs.)
Note: See TracChangeset
for help on using the changeset viewer.