Changeset 5835


Ignore:
Timestamp:
2015-10-26T15:41:05+01:00 (5 years ago)
Author:
mathiot
Message:

ice sheet coupling branche: cosmetic changes

Location:
branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DOM/iscplhsb.F90

    r5823 r5835  
    8282      pvol_flx(:,:,:  ) = 0.0_wp 
    8383      pts_flx (:,:,:,:) = 0.0_wp 
     84      r1_tiscpl = 1._wp / (prdt_iscpl * rn_rdt)  
    8485 
    8586      ! mask tsn and tsb  
     
    8788      tsb(:,:,:,jp_sal)=tsb(:,:,:,jp_sal)*ptmask_b(:,:,:); tsn(:,:,:,jp_sal)=tsn(:,:,:,jp_sal)*tmask(:,:,:); 
    8889 
    89       ! diagnose non conservation of heat, salt and volume  
    90       r1_tiscpl = 1._wp / (prdt_iscpl * rn_rdt)  
    91  
     90      !============================================================================== 
     91      ! diagnose the heat, salt and volume input and compute the correction variable 
     92      !============================================================================== 
     93 
     94      !  
    9295      zssh0(:,:)        = sshn(:,:) * ssmask(:,:) - sshb(:,:) * psmask_b(:,:) 
    9396      IF ( lk_vvl ) zssh0 = 0.0_wp ! already include in the levels by definition 
    94  
     97       
    9598      DO jk = 1,jpk-1 
    9699         DO ji = 2,jpi-1 
     
    119122                  pts_flx (ji,jj,jk,jp_tem)=   pts_flx (ji,jj,jk,jp_tem) + zdtem(ji,jj) * r1_tiscpl 
    120123 
     124                  ! case where we close a cell: check if the neighbour cells are wet  
    121125                  IF ( tmask(ji,jj,jk) == 0._wp .AND. ptmask_b(ji,jj,jk) == 1._wp ) THEN 
    122                      ! case where we close a cell: check if the neighbour cells are wet  
    123126 
    124127                     jip1=ji+1 ; jim1=ji-1 ; jjp1=jj+1 ; jjm1=jj-1 ; 
  • branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DOM/iscplini.F90

    r5823 r5835  
    88 
    99   !!---------------------------------------------------------------------- 
    10    !!   iscpl_rst          : restart correction    in case of coupling with ice sheet 
    11    !!   iscpl_rst_interpol : restart interpolation in case of coupling with ice sheet 
     10   !!   iscpl_init     : initialisation routine (namelist) 
     11   !!   iscpl_alloc    : allocation of correction variables 
    1212   !!---------------------------------------------------------------------- 
    1313   USE dom_oce         ! ocean space and time domain 
  • branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/DOM/iscplrst.F90

    r5823 r5835  
    88 
    99   !!---------------------------------------------------------------------- 
     10   !!   iscpl_stp          : step management 
    1011   !!   iscpl_rst_interpol : restart interpolation in case of coupling with ice sheet 
    1112   !!---------------------------------------------------------------------- 
     
    6869      CALL iom_get( numror, jpdom_autoglo, 'vmask'  , zvmask_b   ) ! need to correct barotropic velocity 
    6970      CALL iom_get( numror, jpdom_autoglo, 'smask'  , zsmask_b   ) ! need to correct barotropic velocity 
    70       CALL iom_get( numror, jpdom_autoglo, 'fse3t_n', ze3t_b(:,:,:) ) ! need to compute temperature correction 
    71       CALL iom_get( numror, jpdom_autoglo, 'fse3u_n', ze3u_b(:,:,:) ) ! need to compute volume      correction  ???? 
    72       CALL iom_get( numror, jpdom_autoglo, 'fse3v_n', ze3v_b(:,:,:) ) ! need to compute volume      correction  ???? 
    73       CALL iom_get( numror, jpdom_autoglo, 'fsdepw_n', zdepw_b(:,:,:) ) ! need to compute volume      correction  ???? 
     71      CALL iom_get( numror, jpdom_autoglo, 'fse3t_n' , ze3t_b(:,:,:) ) ! need to compute temperature correction 
     72      CALL iom_get( numror, jpdom_autoglo, 'fse3u_n' , ze3u_b(:,:,:) )  ! need to correct barotropic velocity 
     73      CALL iom_get( numror, jpdom_autoglo, 'fse3v_n' , ze3v_b(:,:,:) )  ! need to correct barotropic velocity 
     74      CALL iom_get( numror, jpdom_autoglo, 'fsdepw_n', zdepw_b(:,:,:) ) ! need to interpol vertical profile (vvl) 
    7475 
    7576      !! read namelist 
     
    105106      !! next step is an euler time step 
    106107      neuler = 0 
     108 
    107109      !! set _b and _n variables equal 
    108110      tsb (:,:,:,:) = tsn (:,:,:,:) 
     
    110112      vb  (:,:,:  ) = vn  (:,:,:  ) 
    111113      sshb(:,:    ) = sshn(:,:) 
     114 
    112115      !! set _b and _n vertical scale factor equal 
    113116      fse3t_b (:,:,:) = fse3t_n (:,:,:) 
     
    158161      !! allocate variables 
    159162      CALL wrk_alloc(jpi,jpj,jpk,2, zts0                                   ) 
    160       CALL wrk_alloc(jpi,jpj,jpk,   ztmask0, ztmask1 , ztrp, ztmp3d         )  
     163      CALL wrk_alloc(jpi,jpj,jpk,   ztmask0, ztmask1 , ztrp, ztmp3d        )  
    161164      CALL wrk_alloc(jpi,jpj,jpk,   zwmaskn, zwmaskb                       )  
    162165      CALL wrk_alloc(jpi,jpj,       zsmask0, zsmask1                       )  
  • branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

    r5779 r5835  
    13991399      !!                  ***  routine mpp_lnk_sum_3d  *** 
    14001400      !! 
    1401       !! ** Purpose :   Message passing manadgement (sum in the overlap region) 
     1401      !! ** Purpose :   Message passing manadgement (sum the overlap region) 
    14021402      !! 
    14031403      !! ** Method  :   Use mppsend and mpprecv function for passing mask 
     
    15721572      !!                  ***  routine mpp_lnk_sum_2d  *** 
    15731573      !! 
    1574       !! ** Purpose :   Message passing manadgement for 2d array (sum in the overlap region) 
     1574      !! ** Purpose :   Message passing manadgement for 2d array (sum the overlap region) 
    15751575      !! 
    15761576      !! ** Method  :   Use mppsend and mpprecv function for passing mask 
  • branches/NERC/dev_r5589_is_oce_cpl/NEMOGCM/NEMO/OPA_SRC/lib_fortran.F90

    r5802 r5835  
    2424   PRIVATE 
    2525 
    26    PUBLIC   glob_sum   ! used in many places 
    27    PUBLIC   glob_sum_full   ! used in many places 
    28    PUBLIC   DDPDD      ! also used in closea module 
     26   PUBLIC   glob_sum      ! used in many places (masked with tmask_i) 
     27   PUBLIC   glob_sum_full ! used in many places (masked with tmask_h, ie omly over the halos) 
     28   PUBLIC   DDPDD         ! also used in closea module 
    2929   PUBLIC   glob_min, glob_max 
    3030#if defined key_nosignedzero 
     
    360360   FUNCTION glob_sum_full_2d( ptab ) 
    361361      !!---------------------------------------------------------------------- 
    362       !!                  ***  FUNCTION  glob_sum_2d *** 
     362      !!                  ***  FUNCTION  glob_sum_full_2d *** 
    363363      !! 
    364364      !! ** Purpose : perform a sum in calling DDPDD routine 
    365365      !!---------------------------------------------------------------------- 
    366366      REAL(wp), INTENT(in), DIMENSION(:,:) ::   ptab 
    367       REAL(wp)                             ::   glob_sum_full_2d   ! global masked sum 
     367      REAL(wp)                             ::   glob_sum_full_2d   ! global sum (nomask) 
    368368      !! 
    369369      COMPLEX(wp)::   ctmp 
     
    387387   FUNCTION glob_sum_full_3d( ptab ) 
    388388      !!---------------------------------------------------------------------- 
    389       !!                  ***  FUNCTION  glob_sum_3d *** 
     389      !!                  ***  FUNCTION  glob_sum_full_3d *** 
    390390      !! 
    391391      !! ** Purpose : perform a sum on a 3D array in calling DDPDD routine 
    392392      !!---------------------------------------------------------------------- 
    393393      REAL(wp), INTENT(in), DIMENSION(:,:,:) ::   ptab 
    394       REAL(wp)                               ::   glob_sum_full_3d   ! global masked sum 
     394      REAL(wp)                               ::   glob_sum_full_3d   ! global sum (nomask) 
    395395      !! 
    396396      COMPLEX(wp)::   ctmp 
Note: See TracChangeset for help on using the changeset viewer.