Changeset 3918

Timestamp:

06/15/18 14:06:03 (6 years ago)

Author:

omamce

Message:

O.M. : change espfrac from fortran parameter to parameter read in run.def

Location:

TOOLS/MOZAIC/src/MOZAIC

Files:

• dimension.f90 (modified) (2 diffs)
• inipar.f90 (modified) (2 diffs)
• modeles.f90 (modified) (1 diff)

TOOLS/MOZAIC/src/MOZAIC/dimension.f90

@@ -17 +17 @@
    INTEGER (kind=il)   :: jpon   !< Global (1D) dimensions
    !!
+   REAL (kind=rl) :: epsfrac = 1.0E-10_rl  !< Min fraction of sea acceptable. To check : should be compatible with EPSFRA in LMDZ ?
    !
    INTEGER (kind=il) :: jpoe !< Number (maxi) of edges to describe ocean box
@@ -23 +24 @@
    LOGICAL :: lmasko=.FALSE.  !< If TRUE, masked points of oceanic     grid (land) are considered for computing.
    LOGICAL :: l_recalc_o = .TRUE. !< Recalcule des surfaces ocean
+   CHARACTER (len=280) :: c_oce_msk_file = 'NONE'
    !!
    INTEGER (kind=il) :: jpai, jpait, jpaiu, jpaiv !< Dimensions atmosphere X

TOOLS/MOZAIC/src/MOZAIC/inipar.f90

@@ -136 +136 @@
       l_recalc_o = .TRUE.
       CALL getin ('l_recalc_o', l_recalc_o)
-      WRITE (unit=nout, fmt=*) 'l_recalc_o = ', l_recalc_o 
+      WRITE (unit=nout, fmt=*) 'l_recalc_o = ', l_recalc_o
+      !Config Key  = c_oce_msk_file
+      !Config Desc = File containing basin mask for ocean
+      !Config Def  = eORCA1.2.nc
+      !Config Help = File containing basin mask for ocean
+      c_oce_msk_file = 'eORCA1.2.nc'
+      CALL getin ('c_oce_msk_file', c_oce_msk_file)
+      WRITE (unit=nout, fmt=*) 'c_oce_msk_file = ', TRIM(c_oce_msk_file)
       !!
       !! Define atmosphere model
@@ -465 +472 @@
 
 
+
+      !Config Key  = epsfrac
+      !Config Desc = Min fraction of sea acceptable
+      !Config Def  =  1.0E-10_rl
+      !Config Help = 
+      epsfrac = 1.0E-10_rl
+      CALL getin ('epsfrac', epsfrac)
+      WRITE (unit=nout, fmt=*) 'epsfrac = ', epsfrac
+      
       !Config Key = l_etal_oce
       !Config Desc =  ! On etale sur les point océans  proches

TOOLS/MOZAIC/src/MOZAIC/modeles.f90

@@ -16 +16 @@
    REAL (kind=rl), PARAMETER :: epsd   = EPSILON (1.0_rd) !< Quadruple precision epsilon
    REAL (kind=rl), PARAMETER :: epsd10 = 10.0_rd * epsd   !< Quadruple precision epsilon * 10
-   REAL (kind=rl), PARAMETER :: epsfrac = 1.0E-10_rl  !< Min fraction of sea acceptable
+   !!
+
    !!