tools/NESTING/src/agrif_readwrite.f90

@@ -1128,7 +1128,7 @@ CONTAINS
     USE io_netcdf
     !      
     CHARACTER(*) name
-    INTEGER :: nx,ny,k,i,j,jpiglo,jpjglo
+    INTEGER :: nx,ny,k,i,j,jpiglo,jpjglo,ji,jj
     TYPE(Coordinates) :: Grid
     REAL*8, POINTER, DIMENSION(:,:) ::zwf => NULL()
     !
@@ -1145,7 +1145,6 @@ CONTAINS
     nx = SIZE(Grid%Bathy_level,1)
     ny = SIZE(Grid%Bathy_level,2)
     !
-    !      
     ALLOCATE(Grid%tmask(nx,ny,N), &
          Grid%umask(nx,ny,N), &
          Grid%vmask(nx,ny,N), &
@@ -1154,21 +1153,34 @@ CONTAINS
     DO k = 1,N
        !      
        WHERE(Grid%Bathy_level(:,:) <= k-1 )    
-          Grid%tmask(:,:,k) = 0
+          Grid%tmask(:,:,k) = 0.
        ELSEWHERE
-          Grid%tmask(:,:,k) = 1
+          Grid%tmask(:,:,k) = 1.
        END WHERE
        !
     END DO
     !
-    Grid%umask(1:nx-1,:,:) = Grid%tmask(1:nx-1,:,:)*Grid%tmask(2:nx,:,:)
-    Grid%vmask(:,1:ny-1,:) = Grid%tmask(:,1:ny-1,:)*Grid%tmask(:,2:ny,:)
+    DO jj=1,ny
+       DO ji=1,nx-1
+          Grid%umask(ji,jj,:) = Grid%tmask(ji,jj,:) * Grid%tmask(ji+1,jj,:)
+       ENDDO
+    ENDDO
+    DO jj=1,ny-1
+       DO ji=1,nx
+          Grid%vmask(ji,jj,:) = Grid%tmask(ji,jj,:)*Grid%tmask(ji,jj+1,:)
+       ENDDO
+    ENDDO
     !
     Grid%umask(nx,:,:) = Grid%tmask(nx,:,:)
     Grid%vmask(:,ny,:) = Grid%tmask(:,ny,:)
-    !      
-    Grid%fmask(1:nx-1,1:ny-1,:) = Grid%tmask(1:nx-1,1:ny-1,:)*Grid%tmask(2:nx,1:ny-1,:)* &
-         Grid%tmask(1:nx-1,2:ny,:)*Grid%tmask(2:nx,2:ny,:) 
+
+    !    
+    DO jj=1,ny-1
+       DO ji=1,nx-1  
+          Grid%fmask(ji,jj,:) = Grid%tmask(ji,jj,:)*Grid%tmask(ji+1,jj,:)* &
+                                Grid%tmask(ji,jj+1,:)*Grid%tmask(ji+1,jj+1,:) 
+       ENDDO
+    ENDDO
     !
     Grid%fmask(nx,:,:) = Grid%tmask(nx,:,:)
     Grid%fmask(:,ny,:) = Grid%tmask(:,ny,:)
@@ -1233,6 +1245,8 @@ CONTAINS
     nx = SIZE(Grid%Bathy_level,1)
     ny = SIZE(Grid%Bathy_level,2) 
     !
+    WRITE(*,*) 'nx=',nx,' ny=',ny
+    !
     WRITE(*,*) 'Init masks in T points'    
     !     
     ALLOCATE( Grid%tmask(nx,ny,N) )

tools/NESTING/src/bilinear_interp.f90

@@ -205,7 +205,6 @@ CONTAINS
     ALLOCATE(grid1_mask(SIZE(grid1_lat,1)*SIZE(grid1_lat,2)))
     CALL logtab2Dto1D(mask,grid1_mask)
     !      
-    !      Write(*,*) ,'grid1_mask = ',grid1_mask                 
     !
     ! degrees to radian
     !
@@ -529,6 +528,7 @@ CONTAINS
     ! bilinear weights for four corners
     !      
     REAL*8, DIMENSION(4) :: wgts            
+    INTEGER, DIMENSION(1) :: wmax !!clem nearest
     !
     REAL*8 :: &
          plat, plon,       &  ! lat/lon coords of destination point
@@ -653,6 +653,11 @@ CONTAINS
              wgts(3) = iguess*jguess
              wgts(4) = (one-iguess)*jguess
              !	    	        
+!!clem nearest
+!wmax=MAX( 1, MAXLOC( wgts(1:4), MASK = (grid1_mask(src_add(1:4)) == .TRUE.) ) )
+!wgts(1:4)=0.
+!wgts(wmax)=1.
+!!clem
              !
              CALL store_link_bilin(dst_add, src_add, wgts, nmap)
 
@@ -669,7 +674,7 @@ CONTAINS
           !*** search for bilinear failed - use a distance-weighted
           !*** average instead (this is typically near the pole)
           !***
-       ELSE IF (src_add(1) < 0) THEN
+       ELSE IF (src_add(1) <= 0) THEN
 
           src_add = ABS(src_add)
           icount = 0
@@ -693,6 +698,11 @@ CONTAINS
              wgts(3) = src_lats(3)/sum_wgts
              wgts(4) = src_lats(4)/sum_wgts
              !
+!!clem nearest
+!wmax=MAX( 1, MAXLOC( wgts(1:4), MASK = (grid1_mask(src_add(1:4)) == .TRUE.) ) )
+!wgts(1:4)=0.
+!wgts(wmax)=1.
+!!clem
              grid2_frac(dst_add) = one
              CALL store_link_bilin(dst_add, src_add, wgts, nmap)
           ENDIF

tools/NESTING/src/io_netcdf.f90

@@ -1603,4 +1603,53 @@ CONTAINS
     !
   END FUNCTION Dims_Existence
   !
+  LOGICAL FUNCTION Vars_Existence( varname , filename )
+    !
+    CHARACTER(*),INTENT(in) :: varname,filename
+    INTEGER :: status,ncid,varid    
+    !      
+    status = nf90_open(TRIM(filename),NF90_NOWRITE,ncid)
+    IF (status/=nf90_noerr) THEN    
+       WRITE(*,*)"unable to open netcdf file : ",TRIM(filename)
+       STOP
+    ENDIF
+    status = nf90_inq_varid(ncid,TRIM(varname),varid)
+    !      
+    IF (status/=nf90_noerr) THEN
+       Vars_Existence = .FALSE.
+    ELSE
+       Vars_Existence = .TRUE.
+    ENDIF
+    !
+    RETURN
+    !
+  END FUNCTION Vars_Existence
+  !
+  LOGICAL FUNCTION DimUnlimited_Var( varname , filename )
+    !
+    CHARACTER(*),INTENT(in) :: varname,filename
+    INTEGER :: ji, ncid, varid, status, numDims, unlimDimID
+    INTEGER, DIMENSION(nf90_max_var_dims) :: VarDimIds
+    !      
+    status = nf90_open(TRIM(filename),NF90_NOWRITE,ncid)
+    IF (status/=nf90_noerr) THEN    
+       WRITE(*,*)"unable to open netcdf file : ",TRIM(filename)
+       STOP
+    ENDIF
+    status = nf90_inquire(ncid, unlimiteddimid = unlimdimid)
+    !
+    status = nf90_inq_varid(ncid,TRIM(varname),varid)
+    !
+    status = nf90_inquire_variable(ncid, varid , ndims = numdims)
+    status = nf90_inquire_variable(ncid, varid , dimids = vardimids(:numdims))
+
+    DimUnlimited_Var = .FALSE.
+    DO ji = 1, numdims
+       IF( vardimids(ji) == unlimdimid ) DimUnlimited_Var = .TRUE.
+    ENDDO
+
+    RETURN
+    !
+  END FUNCTION DimUnlimited_Var
+  
 END MODULE io_netcdf

tools/README.rst

-*****
-Tools
-*****
-
-.. todo::
-
-   The 'Tools' chapter needs to be enriched
-
-.. contents::
-   :local:
-   :depth: 1
-
-A set of tools is provided with NEMO to setup user own configuration and (pre|post)process data.
-
-How to compile a tool
-=====================
-
-The tool can be compiled using the maketools script in the tools directory as follows:
-
-.. code-block:: console
-
-   $ ./maketools -m 'my_arch' -n '<TOOL_NAME>'
-
-where ``my_arch`` can be selected among available architecture files or providing a user defined one.
-
-List of tools
-=============
-
-BDY_TOOLS
----------
-
-It contains the utility *bdy_reorder* used to reorder old BDY data files used with
-previous versions of the model (before 3.4) to make them compatible with NEMO 3.4.
-
-DMP_TOOLS
----------
-
-Used to create a netcdf file called :file:`resto.nc` containing
-restoration coefficients for use with the :file:`tra_dmp` module in NEMO
-(see :download:`DMP_TOOLS README <../../../tools/DMP_TOOLS/README>`).
-
-DOMAINcfg
----------
-A toolbox allowing the creation of regional configurations from curvilinear grid
-(see :download:`DOMAINcfg README <../../../tools/DOMAINcfg/README.rst>`).
-
-GRIDGEN
--------
-This tool allows the creation of a domain configuration file (``domain_cfg.nc``) containing
-the ocean domain information required to define an ocean configuration from scratch.
-(see :download:`GRIDGEN documentation <../../../tools/GRIDGEN/doc_cfg_tools.pdf>`).
-
-MISCELLANEOUS
--------------
-
-The tool allows to create alternative configurations to the community without
-having to rely on system team sponsorship and support.
-
-MPP_PREP
---------
-
-This tool provides the user with information to choose the best domain decomposition.
-The tool computes the number of water processors for all possible decompositions,
-up to a maximum number of processors
-(see :download:`MPP_PREP documentation <../../../tools/MPP_PREP/mpp_nc.pdf>` and
-:download:`MPP_PREP archive <../../../tools/MPP_PREP/mpp_prep-1.0.tar.gz>`).
-
-NESTING
--------
-
-AGRIF nesting tool allows for the seamless two-way coupling of nested sub-models within
-the NEMO framework as long as these are defined on subsets of the original root grid.
-It allows to create the grid coordinates, the surface forcing and the initial conditions required by
-each sub-model when running a NEMO/AGRIF embedded mode
-(see :download:`NESTING README <../../../tools/NESTING/README>`).
-
-OBSTOOLS
---------
-
-A series of Fortran utilities which are helpful in handling observation files and
-the feedback file output from the NEMO observation operator.
-Further info are available in the :doc:`Nemo manual <cite>`.
-
-REBUILD_NEMO
-------------
-
-REBUILD_NEMO is a tool to rebuild NEMO output files from multiple processors
-(mesh_mask, restart or XIOS output files) into one file
-(see :download:`REBUILD_NEMO README <../../../tools/REBUILD_NEMO/README.rst>`).
-
-REBUILD
--------
-
-It contains the old version of REBUILD_NEMO tool based on the IOIPSL code.
-
-SCOORD_GEN
-----------
-
-Offline tool to generate a vertical coordinates input file for use with S coordinates.
-This has been carried out by copying the model code to an offline tool and then
-modifying it to suppress the use of 3D arrays (to reduce memory usage).
-The tool has been created in preparation for the removal of the vertical grid definition from
-the code.
-The output file should contain all variables that are necessary to restart the model.
-
-SECTIONS_DIADCT
----------------
-
-When the Transport across sections diagnostic is activated (``key_diadct``),
-this tool is used to build the binary file containing the pathways between
-the extremities of each section.
-Further info are available in the :doc:`Nemo manual <cite>`.
-
-SIREN
------
-
-SIREN is a configuration management tool to set up regional configurations with NEMO
-(see :download:`SIREN README <../../../tools/SIREN/README>`).
-
-WEIGHTS
--------
-
-This directory contains software for generating and manipulating interpolation weights for use with
-the Interpolation On the Fly (IOF) option in NEMO v3 onwards
-(see :download:`WEIGHTS README <../../../tools/WEIGHTS/README>`).
-
-TOYATM
-------
-
-This directory contains a simplified model that send/receive atmospheric fields to/from NEMO, for use in the CPL_OASIS sed to test case of the NEMO-OASIS coupling interface.
-This toy requires OASIS3-MCT to be installed and properly defined in the arch file.
-(see :download:`CPL_OASIS README <../../../tests/CPL_OASIS/README.md>`).
-
-ABL_TOOLS
----------
-
-3 steps to generate atmospheric forcings from ECMWF products for ABL1d model with NEMO:
-- main_uvg_hpg (optional): geostrophic wind or horizontal pressure gradient computation on ECMWF eta-levels (to force ABL dynamics)
-- main_vinterp: vertical interpolation from ECWMF vertical eta-levels to ABL Z-levels
-- main_hdrown: 3D-fields horizontal drowning (extrapolation over land totally inspired from SOSIE by L. Brodeau)
-(more details available in Lemarie et al. 2020 GMD)

tools/TOYATM/EXP/namcouple

@@ -6,7 +6,7 @@
 # Any line beginning with # is ignored. Blank lines are not allowed
 ####################################################################
  $NFIELDS 
-12
+13
  $END
 ############################################
  $RUNTIME 
@@ -19,7 +19,7 @@
 ############################################
  $STRINGS 
 O_TepMix ATSSTSST 1 5400 3 rst.nc EXPOUT
-182 149 180 90 torc lmdz
+180 148 180 90 torc lmdz
 P 2 P 0 
 CHECKIN SCRIPR CHECKOUT 
 INT=1
@@ -27,7 +27,7 @@ BILINEAR LR SCALAR LATLON 1
 INT=1
 #
 ATSOLFLX O_QnsMix 1 5400 4 rst.nc EXPOUT
-180 90 182 149 lmdz torc
+180 90 180 148 lmdz torc
 P 0 P 2 
 CHECKIN BLASOLD SCRIPR CHECKOUT 
 INT=1
@@ -36,7 +36,7 @@ BILINEAR LR SCALAR LATLON 1
 INT=1
 #
 ATSOLFLX O_QnsIce 1 5400 4 rst.nc EXPOUT
-180 90 182 149 lmdz torc
+180 90 180 148 lmdz torc
 P 0 P 2 
 CHECKIN BLASOLD SCRIPR CHECKOUT 
 INT=1
@@ -45,7 +45,7 @@ BILINEAR LR SCALAR LATLON 1
 INT=1
 #
 ATSOLFLX O_QsrIce 1 5400 4 rst.nc EXPOUT
-180 90 182 149 lmdz torc
+180 90 180 148 lmdz torc
 P 0 P 2 
 CHECKIN BLASOLD SCRIPR CHECKOUT 
 INT=1
@@ -54,7 +54,7 @@ BILINEAR LR SCALAR LATLON 1
 INT=1
 #
 ATSOLFLX O_QsrMix 1 5400 4 rst.nc EXPOUT
-180 90 182 149 lmdz torc
+180 90 180 148 lmdz torc
 P 0 P 2 
 CHECKIN BLASOLD SCRIPR CHECKOUT 
 INT=1
@@ -63,7 +63,7 @@ BILINEAR LR SCALAR LATLON 1
 INT=1
 #
 ATSOLFLX O_dQnsdT 1 5400 4 rst.nc EXPOUT
-180 90 182 149 lmdz torc
+180 90 180 148 lmdz torc
 P 0 P 2 
 CHECKIN BLASOLD SCRIPR CHECKOUT 
 INT=1
@@ -72,7 +72,7 @@ BILINEAR LR SCALAR LATLON 1
 INT=1
 #
 ATSOLFLX O_OTaux1 1 5400 4 rst.nc EXPOUT
-180 90 182 149 lmdz torc
+180 90 180 148 lmdz torc
 P 0 P 2 
 CHECKIN BLASOLD SCRIPR CHECKOUT 
 INT=1
@@ -81,7 +81,7 @@ BILINEAR LR SCALAR LATLON 1
 INT=1
 #
 ATSOLFLX O_OTauy1 1 5400 4 rst.nc EXPOUT
-180 90 182 149 lmdz torc
+180 90 180 148 lmdz torc
 P 0 P 2 
 CHECKIN BLASOLD SCRIPR CHECKOUT 
 INT=1
@@ -89,8 +89,17 @@ INT=1
 BILINEAR LR SCALAR LATLON 1
 INT=1
 #
+ATSOLFLX O_MSLP 1 5400 4 rst.nc EXPOUT
+180 90 180 148 lmdz torc
+P 0 P 2
+CHECKIN BLASOLD SCRIPR CHECKOUT
+INT=1
+100000.  0
+BILINEAR LR SCALAR LATLON 1
+INT=1
+#
 ATFLXEMP OTotRain 1 5400 3 rst.nc EXPOUT
-180 90 182 149 lmdz torc
+180 90 180 148 lmdz torc
 P 0 P 2 
 CHECKIN SCRIPR CHECKOUT 
 INT=1
@@ -98,7 +107,7 @@ BILINEAR LR SCALAR LATLON 1
 INT=1
 #
 ATFLXEMP OTotSnow 1 5400 3 rst.nc EXPOUT
-180 90 182 149 lmdz torc
+180 90 180 148 lmdz torc
 P 0 P 2 
 CHECKIN SCRIPR CHECKOUT 
 INT=1
@@ -106,7 +115,7 @@ BILINEAR LR SCALAR LATLON 1
 INT=1
 #
 ATFLXEMP OTotEvap 1 5400 3 rst.nc EXPOUT
-180 90 182 149 lmdz torc
+180 90 180 148 lmdz torc
 P 0 P 2 
 CHECKIN SCRIPR CHECKOUT 
 INT=1
@@ -114,7 +123,7 @@ BILINEAR LR SCALAR LATLON 1
 INT=1
 #
 ATFLXEMP OIceEvap 1 5400 3 rst.nc EXPOUT
-180 90 182 149 lmdz torc
+180 90 180 148 lmdz torc
 P 0 P 2 
 CHECKIN SCRIPR CHECKOUT 
 INT=1

tools/TOYATM/cpp_TOYATM.fcm

+bld::tool::fppkeys key_oasis3