Changeset 12689


Ignore:
Timestamp:
2020-04-06T14:44:27+02:00 (7 months ago)
Author:
dancopsey
Message:

Remove any 2D greenland or antarctic mass arrays

Location:
NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/sbc_oce.F90

    r12576 r12689  
    136136   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   atm_co2           !: atmospheric pCO2                             [ppm] 
    137137   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: xcplmask          !: coupling mask for ln_mixcpl (warning: allocated in sbccpl) 
    138    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   greenland_icesheet_mass_array, greenland_icesheet_mask  
    139    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   antarctica_icesheet_mass_array, antarctica_icesheet_mask  
     138   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   greenland_icesheet_mask  
     139   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   antarctica_icesheet_mask  
    140140 
    141141   !!---------------------------------------------------------------------- 
     
    212212         &      ssv_m  (jpi,jpj) , sss_m(jpi,jpj) , ssh_m(jpi,jpj) , STAT=ierr(4) ) 
    213213         ! 
    214       ALLOCATE( greenland_icesheet_mass_array(jpi,jpj) , antarctica_icesheet_mass_array(jpi,jpj) )  
    215214      ALLOCATE( greenland_icesheet_mask(jpi,jpj) , antarctica_icesheet_mask(jpi,jpj) )  
    216215         ! 
  • NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/sbccpl.F90

    r12675 r12689  
    501501  
    502502      srcv(jpr_grnm  )%clname = 'OGrnmass'   
    503       IF( TRIM( sn_rcv_grnm%cldes ) == 'coupled' .OR. TRIM( sn_rcv_grnm%cldes ) == 'coupled0d' ) srcv(jpr_grnm)%laction = .TRUE.          
    504       IF( TRIM( sn_rcv_grnm%cldes ) == 'coupled0d' ) srcv(jpr_grnm  )%dimensions = 0 ! Scalar field  
     503      IF( TRIM( sn_rcv_grnm%cldes ) == 'coupled' ) THEN  
     504         srcv(jpr_grnm)%laction = .TRUE.   
     505         srcv(jpr_grnm)%dimensions = 0 ! Scalar field 
     506      ENDIF  
    505507        
    506508      srcv(jpr_antm  )%clname = 'OAntmass'  
    507       IF( TRIM( sn_rcv_antm%cldes ) == 'coupled' .OR. TRIM( sn_rcv_antm%cldes ) == 'coupled0d' )  srcv(jpr_antm)%laction = .TRUE.  
    508       IF( TRIM( sn_rcv_antm%cldes ) == 'coupled0d' ) srcv(jpr_antm  )%dimensions = 0 ! Scalar field    
     509      IF( TRIM( sn_rcv_antm%cldes ) == 'coupled' ) THEN 
     510         srcv(jpr_antm)%laction = .TRUE. 
     511         srcv(jpr_antm)%dimensions = 0 ! Scalar field 
     512      ENDIF 
     513 
    509514      srcv(jpr_isf)%clname = 'OIcshelf'   ;  IF( TRIM( sn_rcv_isf%cldes) == 'coupled' )   srcv(jpr_isf)%laction = .TRUE. 
    510515      srcv(jpr_icb)%clname = 'OIceberg'   ;  IF( TRIM( sn_rcv_icb%cldes) == 'coupled' )   srcv(jpr_icb)%laction = .TRUE. 
     
    11121117          antarctica_icesheet_mask = 0.0  
    11131118          WHERE( gphit < 0.0 ) antarctica_icesheet_mask = 1.0  
    1114   
    1115           ! initialise other variables  
    1116           greenland_icesheet_mass_array(:,:) = 0.0  
    1117           antarctica_icesheet_mass_array(:,:) = 0.0  
    1118   
     1119   
    11191120          IF( .not. ln_rstart ) THEN  
    11201121             greenland_icesheet_mass = 0.0   
Note: See TracChangeset for help on using the changeset viewer.