Changeset 3626

Timestamp:

Jan 30, 2020, 2:38:10 PM (4 years ago)

Author:

lguez

Message:

Bug fix: use missing_val from XIOS for output with XIOS, else the
operations are not done propoerly in XIOS.

Location:

LMDZ6/branches/Ocean_skin

Files:

• arch/arch-X64_JEANZAY.env (modified) (1 diff)
• arch/arch-X64_JEANZAY.fcm (modified) (1 diff)
• libf/phylmd/pbl_surface_mod.F90 (modified) (3 diffs)
• libf/phylmd/phyetat0.F90 (modified) (2 diffs)
• libf/phylmd/phys_output_ctrlout_mod.F90 (modified) (3 diffs)

LMDZ6/branches/Ocean_skin/arch/arch-X64_JEANZAY.env

@@ -6 +6 @@
 
 module load gcc/6.5.0
-module load idrmem/1.4-mpi

LMDZ6/branches/Ocean_skin/arch/arch-X64_JEANZAY.fcm

@@ -14 +14 @@
 %OMP_FFLAGS          -qopenmp
 %BASE_LD             -i4 -r8 -auto -lmkl_intel_lp64 -lmkl_core -lmkl_sequential -lpthread
-%MPI_LD              -lidrmem
+%MPI_LD              
 %OMP_LD              -qopenmp

LMDZ6/branches/Ocean_skin/libf/phylmd/pbl_surface_mod.F90

@@ -294 +294 @@
     use phys_state_var_mod, only: ds_ns, dt_ns
     use phys_output_var_mod, only: t_int, s_int, dter, dser, tkt, tks, rf, taur
-    use netcdf, only: nf90_fill_real
+#ifdef CPP_XIOS
+    USE wxios, ONLY: missing_val
+#else
+    use netcdf, only: missing_val => nf90_fill_real
+#endif
 
     IMPLICIT NONE
@@ -966 +970 @@
 
     if (activate_ocean_skin >= 1) then
-       t_int = nf90_fill_real
-       s_int = nf90_fill_real
-       dter = nf90_fill_real
-       dser = nf90_fill_real
-       tkt = nf90_fill_real
-       tks = nf90_fill_real
-       rf = nf90_fill_real
-       taur = nf90_fill_real
+       t_int = missing_val
+       s_int = missing_val
+       dter = missing_val
+       dser = missing_val
+       tkt = missing_val
+       tks = missing_val
+       rf = missing_val
+       taur = missing_val
     end if
 
@@ -2566 +2570 @@
 
        if (nsrf == is_oce .and. activate_ocean_skin >= 1) then
-          dt_ns = nf90_fill_real
-          ds_ns = nf90_fill_real
+          dt_ns = missing_val
+          ds_ns = missing_val
           ds_ns(ni(:knon)) = yds_ns(:knon)
           dt_ns(ni(:knon)) = ydt_ns(:knon)

LMDZ6/branches/Ocean_skin/libf/phylmd/phyetat0.F90

@@ -29 +29 @@
   USE ocean_slab_mod, ONLY: nslay, tslab, seaice, tice, ocean_slab_init
   USE time_phylmdz_mod, ONLY: init_iteration, pdtphys, itau_phy
-  use netcdf, only: nf90_fill_real
+#ifdef CPP_XIOS
+  USE wxios, ONLY: missing_val
+#else
+  use netcdf, only: missing_val => nf90_fill_real
+#endif
   use config_ocean_skin_m, only: activate_ocean_skin
 
@@ -542 +546 @@
 
      where (pctsrf(:, is_oce) == 0.)
-        ds_ns = nf90_fill_real
-        dt_ns = nf90_fill_real
+        ds_ns = missing_val
+        dt_ns = missing_val
      end where
   end if

LMDZ6/branches/Ocean_skin/libf/phylmd/phys_output_ctrlout_mod.F90

@@ -1956 +1956 @@
 
    type(ctrl_out), save:: o_ds_ns &
-        = ctrl_out([1, 10, 10, 1, 10, 10, 11, 11, 11, 11], 'ds_ns', &
+        = ctrl_out([1, 10, 10, 1, 10, 10, 11, 11, 11, 11], 'dS_ns', &
         "delta salinity near surface", "ppt", '')
 
@@ -1968 +1968 @@
 
    type(ctrl_out), save:: o_dser &
-        = ctrl_out([1, 10, 10, 1, 10, 10, 11, 11, 11, 11], 'dser', &
+        = ctrl_out([1, 10, 10, 1, 10, 10, 11, 11, 11, 11], 'dSer', &
         "salinity variation in the diffusive microlayer", "ppt", '')
 
@@ -1977 +1977 @@
    type(ctrl_out), save:: o_tks &
         = ctrl_out([1, 10, 10, 1, 10, 10, 11, 11, 11, 11], 'tks', &
-        "thickness os salinity microlayer", "m", '')
+        "thickness of salinity microlayer", "m", '')
 
    type(ctrl_out), save:: o_rf &