Changeset 11927

Timestamp:

2019-11-19T15:49:40+01:00 (5 years ago)

Author:

dancopsey

Message:

Fix compile errors and resolve conflicts

Location:

NEMO/branches/UKMO/NEMO_4.0.1_fix_cpl/src/ICE

Files:

• iceistate.F90 (modified) (2 diffs)
• icerst.F90 (modified) (1 diff)
• icewri.F90 (modified) (2 diffs)

NEMO/branches/UKMO/NEMO_4.0.1_fix_cpl/src/ICE/iceistate.F90

@@ -51 +51 @@
    REAL(wp) ::   rn_apd_ini_s, rn_hpd_ini_s
    !
-   !                              ! if ln_iceini_file = T
+   !                              ! if nn_iceini_file = 1
    INTEGER , PARAMETER ::   jpfldi = 9           ! maximum number of files to read
    INTEGER , PARAMETER ::   jp_hti = 1           ! index of ice thickness    (m)
@@ -498 +498 @@
          WRITE(numout,*) '      ice initialization from a netcdf file            nn_iceini_file = ', nn_iceini_file
          WRITE(numout,*) '      max ocean temp. above Tfreeze with initial ice   rn_thres_sst   = ', rn_thres_sst
-         IF( ln_iceini .AND. .NOT.ln_iceini_file ) THEN
+         IF( ln_iceini .AND. nn_iceini_file == 0 ) THEN
             WRITE(numout,*) '      initial snw thickness in the north-south         rn_hts_ini     = ', rn_hts_ini_n,rn_hts_ini_s 
             WRITE(numout,*) '      initial ice thickness in the north-south         rn_hti_ini     = ', rn_hti_ini_n,rn_hti_ini_s

NEMO/branches/UKMO/NEMO_4.0.1_fix_cpl/src/ICE/icerst.F90

@@ -274 +274 @@
          CALL ice_istate( nit000 )
          !
-         IF( .NOT.ln_iceini .OR. .NOT.ln_iceini_file ) &
-            &   CALL ctl_stop('STOP', 'ice_rst_read: you need ln_ice_ini=T and ln_iceini_file=T')
+         IF( .NOT.ln_iceini .OR. nn_iceini_file == 0 ) &
+            &   CALL ctl_stop('STOP', 'ice_rst_read: you need ln_ice_ini=T and nn_iceini_file=0')
          !
       ENDIF

NEMO/branches/UKMO/NEMO_4.0.1_fix_cpl/src/ICE/icewri.F90

@@ -152 +152 @@
       IF( iom_use('iceconc_cat' ) )   CALL iom_put( 'iceconc_cat' , a_i            * zmsk00l                                   ) ! area for categories
       IF( iom_use('icethic_cat' ) )   CALL iom_put( 'icethic_cat' , h_i            * zmsk00l + zmiss_val * ( 1._wp - zmsk00l ) ) ! thickness for categories
-      IF( iom_use('icevol_cat'  ) )   CALL iom_put( "icevol_cat"  , v_i            * zmsk00l                                   ) ! volume for categories
       IF( iom_use('snwthic_cat' ) )   CALL iom_put( 'snwthic_cat' , h_s            * zmsksnl + zmiss_val * ( 1._wp - zmsksnl ) ) ! snow depth for categories
       IF( iom_use('icesalt_cat' ) )   CALL iom_put( 'icesalt_cat' , s_i            * zmsk00l + zmiss_val * ( 1._wp - zmsk00l ) ) ! salinity for categories
@@ -166 +165 @@
       IF( iom_use('iceafpnd_cat') )   CALL iom_put( 'iceafpnd_cat',   a_ip_frac    * zmsk00l                                   ) ! melt pond frac for categories
       IF( iom_use('icealb_cat'  ) )   CALL iom_put( 'icealb_cat'  ,   alb_ice      * zmsk00l + zmiss_val * ( 1._wp - zmsk00l ) ) ! ice albedo for categories
+
+      IF( iom_use('icevol_cat'  ) )   CALL iom_put( "icevol_cat"  , v_i            * zmsk00l                                   ) ! volume for categories
 
       !------------------