Changeset 2636 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90

Timestamp:

2011-03-01T20:04:06+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; move ctl_stop & warn in lib_mpp to avoid a circular dependency + ctl_stop improvment

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) (5 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90

@@ -15 +15 @@
    USE oce             ! ocean dynamics and tracers
    USE dom_oce         ! ocean space and time domain
-   USE ioipsl, ONLY :   ymds2ju, ju2ymds   ! for calendar
    USE phycst          ! ???
    USE in_out_manager  ! I/O manager
    USE iom             ! I/O manager library
    USE geo2ocean       ! for vector rotation on to model grid
+   USE lib_mpp         ! MPP library
+   USE ioipsl, ONLY :   ymds2ju, ju2ymds   ! for calendar
 
    IMPLICIT NONE
@@ -391 +392 @@
          CALL fld_clopn( sdjf, iyear, imonth, iday )
       ENDIF 
-
+      !
    END SUBROUTINE fld_init
 
@@ -804 +805 @@
       !!                file, restructuring as required
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released, iwrk_in_use, iwrk_not_released
-      USE wrk_nemo, ONLY: data_tmp => wrk_2d_1
-      USE wrk_nemo, ONLY: data_src => iwrk_2d_1
+      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released, iwrk_in_use, iwrk_not_released
+      USE wrk_nemo, ONLY:   data_tmp =>  wrk_2d_1     ! 2D real    workspace
+      USE wrk_nemo, ONLY:   data_src => iwrk_2d_1     ! 2D integer workspace
       !!
       TYPE( FLD ), INTENT(in) ::   sd   ! field with name of weights file
@@ -822 +823 @@
       IF(  wrk_in_use(2, 1)  .OR.  iwrk_in_use(2,1) ) THEN
          CALL ctl_stop('fld_weights: requested workspace arrays are unavailable.')   ;   RETURN
-      END IF
+      ENDIF
       !
       IF( nxt_wgt > tot_wgts ) THEN
@@ -934 +935 @@
       ENDIF
 
-      IF( wrk_not_released(2, 1) .OR.    &
+      IF(  wrk_not_released(2, 1) .OR.    &
           iwrk_not_released(2, 1)   )   CALL ctl_stop('fld_weights: failed to release workspace arrays')
       !