New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 7037 for branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90 – NEMO

Ignore:
Timestamp:
2016-10-18T15:32:04+02:00 (7 years ago)
Author:
mocavero
Message:

ORCA2_LIM_PISCES hybrid version update

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2016/dev_r6519_HPC_4/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90

    r6748 r7037  
    7373         ssv_m(:,:) = vb(:,:,1) 
    7474!$OMP END PARALLEL WORKSHARE 
    75          IF( l_useCT )  THEN    ;   sst_m(:,:) = eos_pt_from_ct( zts(:,:,jp_tem), zts(:,:,jp_sal) ) 
    76          ELSE                    ;   sst_m(:,:) = zts(:,:,jp_tem) 
     75         IF( l_useCT )  THEN 
     76!$OMP PARALLEL WORKSHARE 
     77           sst_m(:,:) = eos_pt_from_ct( zts(:,:,jp_tem), zts(:,:,jp_sal) ) 
     78!$OMP END PARALLEL WORKSHARE 
     79         ELSE                     
     80!$OMP PARALLEL WORKSHARE 
     81           sst_m(:,:) = zts(:,:,jp_tem) 
     82!$OMP END PARALLEL WORKSHARE 
    7783         ENDIF 
    7884!$OMP PARALLEL WORKSHARE 
     
    8288         IF( ln_apr_dyn ) THEN   
    8389!$OMP PARALLEL WORKSHARE 
    84    ssh_m(:,:) = sshn(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) 
     90           ssh_m(:,:) = sshn(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) 
    8591!$OMP END PARALLEL WORKSHARE 
    8692         ELSE                     
    8793!$OMP PARALLEL WORKSHARE 
    88    ssh_m(:,:) = sshn(:,:) 
     94           ssh_m(:,:) = sshn(:,:) 
    8995!$OMP END PARALLEL WORKSHARE 
    9096         ENDIF 
     
    107113            ssv_m(:,:) = zcoef * vb(:,:,1) 
    108114!$OMP END PARALLEL WORKSHARE 
    109             IF( l_useCT )  THEN    ;   sst_m(:,:) = zcoef * eos_pt_from_ct( zts(:,:,jp_tem), zts(:,:,jp_sal) ) 
    110             ELSE                    ;   sst_m(:,:) = zcoef * zts(:,:,jp_tem) 
     115            IF( l_useCT )  THEN 
     116!$OMP PARALLEL WORKSHARE 
     117              sst_m(:,:) = zcoef * eos_pt_from_ct( zts(:,:,jp_tem), zts(:,:,jp_sal) ) 
     118!$OMP END PARALLEL WORKSHARE 
     119            ELSE                     
     120!$OMP PARALLEL WORKSHARE 
     121              sst_m(:,:) = zcoef * zts(:,:,jp_tem) 
     122!$OMP END PARALLEL WORKSHARE 
    111123            ENDIF 
    112124!$OMP PARALLEL WORKSHARE 
     
    116128            IF( ln_apr_dyn ) THEN    
    117129!$OMP PARALLEL WORKSHARE 
    118    ssh_m(:,:) = zcoef * ( sshn(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) ) 
     130              ssh_m(:,:) = zcoef * ( sshn(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) ) 
    119131!$OMP END PARALLEL WORKSHARE 
    120132            ELSE                     
    121133!$OMP PARALLEL WORKSHARE 
    122    ssh_m(:,:) = zcoef * sshn(:,:) 
     134              ssh_m(:,:) = zcoef * sshn(:,:) 
    123135!$OMP END PARALLEL WORKSHARE 
    124136            ENDIF 
     
    149161         ssv_m(:,:) = ssv_m(:,:) + vb(:,:,1) 
    150162!$OMP END PARALLEL WORKSHARE 
    151          IF( l_useCT )  THEN    ;   sst_m(:,:) = sst_m(:,:) + eos_pt_from_ct( zts(:,:,jp_tem), zts(:,:,jp_sal) ) 
    152          ELSE                    ;   sst_m(:,:) = sst_m(:,:) + zts(:,:,jp_tem) 
     163         IF( l_useCT )  THEN    
     164!$OMP PARALLEL WORKSHARE 
     165           sst_m(:,:) = sst_m(:,:) + eos_pt_from_ct( zts(:,:,jp_tem), zts(:,:,jp_sal) ) 
     166!$OMP END PARALLEL WORKSHARE 
     167         ELSE                    
     168!$OMP PARALLEL WORKSHARE 
     169           sst_m(:,:) = sst_m(:,:) + zts(:,:,jp_tem) 
     170!$OMP END PARALLEL WORKSHARE 
    153171         ENDIF 
    154172!$OMP PARALLEL WORKSHARE 
     
    158176         IF( ln_apr_dyn ) THEN    
    159177!$OMP PARALLEL WORKSHARE 
    160    ssh_m(:,:) = ssh_m(:,:) + sshn(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) 
     178           ssh_m(:,:) = ssh_m(:,:) + sshn(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) 
    161179!$OMP END PARALLEL WORKSHARE 
    162180         ELSE                     
    163181!$OMP PARALLEL WORKSHARE 
    164    ssh_m(:,:) = ssh_m(:,:) + sshn(:,:) 
     182           ssh_m(:,:) = ssh_m(:,:) + sshn(:,:) 
    165183!$OMP END PARALLEL WORKSHARE 
    166184         ENDIF 
     
    257275               CALL iom_get( numror, jpdom_autoglo, 'frq_m'  , frq_m  ) 
    258276            ELSE 
     277!$OMP PARALLEL WORKSHARE 
    259278               frq_m(:,:) = 1._wp   ! default definition 
     279!$OMP END PARALLEL WORKSHARE 
    260280            ENDIF 
    261281            ! 
Note: See TracChangeset for help on using the changeset viewer.