Changeset 6107 for TOOLS

Timestamp:

03/24/22 09:44:44 (2 years ago)

Author:

omamce

Message:

MOSAIX (O.M.) : update used module. Simplifies fortran after corrections in XIOS

Location:

TOOLS/MOSAIX

Files:

• CreateOasisGrids.bash (modified) (1 diff)
• CreateWeightsMask.bash (modified) (8 diffs)
• src/MOSAIX/interpol.f90 (modified) (6 diffs)

TOOLS/MOSAIX/CreateOasisGrids.bash

@@ -66 +66 @@
         MpiRun="time ccc_mprun"
         PyRun="time ccc_mprun -n 1" # Needed to force python to run on one process only
-        #module purge
-        source $(ccc_home -u igcmg)/MachineEnvironment/irene/env_irene
+        module purge
         source ${SUBMIT_DIR}/arch.env
-        #module load nco
+        module load nco/4.9.1
+        module load cdo/1.9.5
         module load python3 
         module load datadir/igcmg

TOOLS/MOSAIX/CreateWeightsMask.bash

@@ -3 +3 @@
 #MSUB -o Out_WeightsMask    # Standard output
 #MSUB -e Out_WeightsMask    # Error output
-#MSUB -n 4                  # Number of processors
+#MSUB -n 1                  # Number of processors
 #MSUB -T 7200              # Time limit (seconds)
 #MSUB -Q normal
@@ -73 +73 @@
 #CplModel=ORCA2.3xICO30
 #CplModel=ORCA2.3xICO40
-CplModel=eORCA1.2xLMD144142
+#CplModel=eORCA1.2xLMD144142
 #CplModel=eORCA1.4.0xLMD144142
 #CplModel=eORCA1.4.2xLMD144142
 #CplModel=eORCA1.2xLMD256256
 #CplModel=eORCA1.2xICO40
+CplModel=eORCA1.4.2xICO40
 #CplModel=eORCA1.2xICO450
 #CplModel=eORCA025.1xLMD256256
@@ -127 +128 @@
 # Each item in CommandList describes the properties of interpolation weights to generate. 
 # White spaces separate analysis.
+#
 # \!/ No spaces in any analysis \!/
 #
@@ -178 +180 @@
 #CommandList=( Calving )
 #CommandList=( Grids )
-
-if [[ ${Version} = test_runoff_* ]] ; then
-    CommandList=( Runoff )
-fi
 
 ## ===========================================================================
@@ -281 +279 @@
     module purge
     source ${SUBMIT_DIR}/arch.env
-    module load nco/4.9.2
+    module load nco/4.9.1
+    module load cdo/1.9.5
     module load python3 
     module load datadir/igcmg
     module list
+    cp ${SUBMIT_DIR}/arch.env . ${TMPDIR}
     set -e
     ;;
@@ -291 +291 @@
     TMPDIR=${HOME}/Scratch/TMP
     SUBMIT_DIR=$(pwd)
-    MpiRun="/opt/local/bin/mpirun -n 4"
+    MpiRun="/opt/local/bin/mpirun -n 1"
     PyRun="time"
     ;; 
@@ -319 +319 @@
 case ${OCE} in # Periodicity type of ORCA grid
     ( ORCA2.4              ) OcePerio=4.2 ;; # 4 ORCA 6 PALEORCA
-    ( ORCA2*               ) OcePerio=4   ;;  # 4 ORCA 6 PALEORCA
+    ( ORCA2*               ) OcePerio=4   ;; # 4 ORCA 6 PALEORCA
     ( eORCA1.2             ) OcePerio=6   ;;
     ( eORCA1.4.0           ) OcePerio=6   ;;
@@ -334 +334 @@
 cp ${SUBMIT_DIR}/iodef_oce_to_atm.xml   .
 
-cp ${R_IN}/OCE/NEMO/${OCE}/${OCE}_coordinates_mask.nc  .
+[[ -f ${R_IN}/OCE/NEMO/${OCE}/${OCE}_coordinates_mask.nc       ]] && cp ${R_IN}/OCE/NEMO/${OCE}/${OCE}_coordinates_mask.nc        .
+[[ -f ${R_IN}/OCE/NEMO/${OCE}/GRIDS/${OCE}_coordinates_mask.nc ]] && cp ${R_IN}/OCE/NEMO/${OCE}/GRIDS/${OCE}_coordinates_mask.nc  .
+if [[ ! -f ${OCE}_coordinates_mask.nc ]] ; then
+    exit 1
+fi
+
 cp ${R_IN}/ATM/GRID/${ATM}_grid.nc .
 

TOOLS/MOSAIX/src/MOSAIX/interpol.f90

@@ -105 +105 @@
       CALL xios_get_domain_attr ("domain_src", lonvalue_1d=lon_src(:,1), latvalue_1d=lat_src(1,:) )
       lon_src (:,:) = SPREAD ( lon_src(:,1), DIM=2, ncopies=nj_src)
-      lat_src (:,:) = SPREAD ( lat_src(1,:), DIM=1, ncopies=nj_src)
+      lat_src (:,:) = SPREAD ( lat_src(1,:), DIM=1, ncopies=ni_src)
    CASE default
       IF ( nj_src == 1 .AND. ni_src == 1) THEN
@@ -125 +125 @@
    ALLOCATE ( imask_src (ni_src, nj_src), lmask_src (ni_src, nj_src) )
    IF ( l_mask_src ) THEN 
-      WRITE (UNIT=nout, FMT="('-- ', 1I4.4, ' -- Receive field mask_src')" ) rank
+      WRITE (UNIT=nout, FMT="('-- ', 1I4.4, ' -- Receive field mask_src : ', 2I8)" ) rank, SHAPE (imask_src)
       CALL xios_recv_field ("mask_src", imask_src)
       lmask_src = .FALSE.
@@ -136 +136 @@
    !< Read area on the source grid
    IF ( l_use_area ) THEN
-      IF ( l_src_is0D ) ALLOCATE ( area_src (  1   , 1     ) )
-      IF ( l_src_is1D ) ALLOCATE ( area_src (  1   , ni_src) )
-      IF ( l_src_is2D ) ALLOCATE ( area_src (ni_src, nj_src) )
-      WRITE (UNIT=nout, FMT="('-- ', 1I4.4, ' -- Receive field area_src')" ) rank
+      ALLOCATE ( area_src (ni_src, nj_src) )
       CALL xios_recv_field ("area_src", area_src(:,:))
-      WRITE (UNIT=nout, FMT="('-- ', 1I4.4, ' -- Sum area_src : ', 2E15.3)" ) rank, SUM(area_src)
-   ENDIF
-   
+   ENDIF
+
    !< Read characteristics of the destination grid
    WRITE (UNIT=nout, FMT="('-- ', 1I4.4, ' -- Reading domain_dst')" ) rank
@@ -171 +167 @@
    ALLOCATE ( imask_dst (ni_dst, nj_dst), lmask_dst (ni_dst, nj_dst) )
    IF ( l_mask_dst ) THEN
-      WRITE (UNIT=nout, FMT="('-- ', 1I4.4, ' -- Receive field mask_dst')" ) rank 
+      WRITE (UNIT=nout, FMT="('-- ', 1I4.4, ' -- Receive field mask_dst : ', 2I8)" ) rank, SHAPE (imask_dst)
       CALL xios_recv_field ("mask_dst", imask_dst)
       lmask_dst = .FALSE.
@@ -182 +178 @@
    !< Read area on the destination grid
    IF ( l_use_area ) THEN
-      IF ( l_dst_is0D ) ALLOCATE ( area_dst (  1   , 1     ) )
-      IF ( l_dst_is1D ) ALLOCATE ( area_dst (  1   , ni_dst) )
-      IF ( l_dst_is2D ) ALLOCATE ( area_dst (ni_dst, nj_dst) )
-      WRITE (UNIT=nout, FMT="('-- ', 1I4.4, ' -- receive field area_dst')" ) rank 
+      ALLOCATE ( area_dst (ni_dst, nj_dst) )
       CALL xios_recv_field ("area_dst", area_dst(:,:))
-      WRITE (UNIT=nout, FMT="('-- ', 1I4.4, ' -- Sum area_dst : ', 2E15.3)" ) rank, SUM(area_dst)
+      WRITE (UNIT=nout, FMT="('-- ', 1I4.4, ' -- Sum area_src : ', 2E15.3)" ) rank, SUM(area_src)
    ENDIF
    
@@ -213 +206 @@
    CALL xios_close_context_definition ()
 
+   WRITE (UNIT=nout, FMT="('-- ', 1I4.4, ' -- Update calendar')" ) rank
    CALL xios_update_calendar (1)
    WRITE (UNIT=nout, FMT="('-- ', 1I4.4, ' -- Send field mask_src')" ) rank
    CALL xios_send_field ("mask_src", imask_src)
 
-   !!< Creates analytic fields and interpolate
+   WRITE (UNIT=nout, FMT="('-- ', 1I4.4, ' -- Creates analytic fields and interpolate')" ) rank
    ALLOCATE ( field_src (ni_src, nj_src) )