Changeset 5282 for branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM/NEMO/LIM_SRC_3

Timestamp:

2015-05-18T17:19:50+02:00 (9 years ago)

Author:

diovino

Message:

Dev. branch CMCC4_simplification ticket #1456

Location:

branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM/NEMO/LIM_SRC_3

Files:

• iceini.F90 (modified) (1 diff)
• limrst.F90 (modified) (2 diffs)
• limwri.F90 (modified) (2 diffs)
• limwri_dimg.h90 (deleted)

branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM/NEMO/LIM_SRC_3/iceini.F90

@@ -82 +82 @@
       CALL lim_thd_sal_init            ! set ice salinity parameters
       !
-      rdt_ice   = nn_fsbc * rdttra(1)  ! sea-ice timestep
+      rdt_ice   = nn_fsbc * rdt        ! sea-ice timestep
       r1_rdtice = 1._wp / rdt_ice      ! sea-ice timestep inverse
       !

branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90

@@ -73 +73 @@
             WRITE(numout,*)
             SELECT CASE ( jprstlib )
-            CASE ( jprstdimg )   ;   WRITE(numout,*) '             open ice restart binary file: '//clname
             CASE DEFAULT         ;   WRITE(numout,*) '             open ice restart NetCDF file: '//clname
             END SELECT
@@ -326 +325 @@
       ENDIF
 
-      IF ( jprstlib == jprstdimg ) THEN
-        ! eventually read netcdf file (monobloc)  for restarting on different number of processors
-        ! if {cn_icerst_in}.nc exists, then set jlibalt to jpnf90
-        INQUIRE( FILE = TRIM(cn_icerst_in)//'.nc', EXIST = llok )
-        IF ( llok ) THEN ; jlibalt = jpnf90  ; ELSE ; jlibalt = jprstlib ; ENDIF
-      ENDIF
-
       CALL iom_open ( cn_icerst_in, numrir, kiolib = jprstlib )
 

branches/2015/dev_r5056_CMCC4_simplification/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90

@@ -42 +42 @@
 CONTAINS
 
-#if defined key_dimgout
-# include "limwri_dimg.h90"
-#else
 
    SUBROUTINE lim_wri( kindic )
@@ -280 +277 @@
       
    END SUBROUTINE lim_wri
-#endif