Changeset 12669

Timestamp:

2020-04-03T17:21:52+02:00 (4 years ago)

Author:

clevy

Message:

Update TOYATM for future NEMO release, see #2379

Location:

utils/tools_CPL_OASIS_ticket2379_2020/TOYATM

Files:

• EXP/namcouple (modified) (13 diffs)
• src/toyatm.F90 (modified) (3 diffs)

utils/tools_CPL_OASIS_ticket2379_2020/TOYATM/EXP/namcouple

@@ -11 +11 @@
 ############################################
  $RUNTIME 
-259200
+864000
  $END
 ############################################
@@ -19 +19 @@
 ############################################
  $STRINGS 
-O_SSTSST ATSSTSST 1 28800 3 rst.nc EXPORTED
+O_TepMix ATSSTSST 1 5400 3 rst.nc EXPOUT
 182 149 180 90 torc lmdz
 P 2 P 0 
@@ -27 +27 @@
 INT=1
 #
-ATSOLFLX O_QnsMix 1 28800 4 rst.nc EXPORTED
+ATSOLFLX O_QnsMix 1 5400 4 rst.nc EXPOUT
 180 90 182 149 lmdz torc
 P 0 P 2 
@@ -36 +36 @@
 INT=1
 #
-ATSOLFLX O_QnsIce 1 28800 4 rst.nc EXPORTED
+ATSOLFLX O_QnsIce 1 5400 4 rst.nc EXPOUT
 180 90 182 149 lmdz torc
 P 0 P 2 
@@ -45 +45 @@
 INT=1
 #
-ATSOLFLX O_QsrIce 1 28800 4 rst.nc EXPORTED
+ATSOLFLX O_QsrIce 1 5400 4 rst.nc EXPOUT
 180 90 182 149 lmdz torc
 P 0 P 2 
@@ -54 +54 @@
 INT=1
 #
-ATSOLFLX O_QsrMix 1 28800 4 rst.nc EXPORTED
+ATSOLFLX O_QsrMix 1 5400 4 rst.nc EXPOUT
 180 90 182 149 lmdz torc
 P 0 P 2 
@@ -63 +63 @@
 INT=1
 #
-ATSOLFLX O_dQnsdT 1 28800 4 rst.nc EXPORTED
+ATSOLFLX O_dQnsdT 1 5400 4 rst.nc EXPOUT
 180 90 182 149 lmdz torc
 P 0 P 2 
@@ -72 +72 @@
 INT=1
 #
-ATSOLFLX O_OTaux1 1 28800 4 rst.nc EXPORTED
+ATSOLFLX O_OTaux1 1 5400 4 rst.nc EXPOUT
 180 90 182 149 lmdz torc
 P 0 P 2 
@@ -81 +81 @@
 INT=1
 #
-ATSOLFLX O_OTauy1 1 28800 4 rst.nc EXPORTED
+ATSOLFLX O_OTauy1 1 5400 4 rst.nc EXPOUT
 180 90 182 149 lmdz torc
 P 0 P 2 
@@ -90 +90 @@
 INT=1
 #
-ATFLXEMP OTotRain 1 28800 3 rst.nc EXPORTED
+ATFLXEMP OTotRain 1 5400 3 rst.nc EXPOUT
 180 90 182 149 lmdz torc
 P 0 P 2 
@@ -98 +98 @@
 INT=1
 #
-ATFLXEMP OTotSnow 1 28800 3 rst.nc EXPORTED
+ATFLXEMP OTotSnow 1 5400 3 rst.nc EXPOUT
 180 90 182 149 lmdz torc
 P 0 P 2 
@@ -106 +106 @@
 INT=1
 #
-ATFLXEMP OTotEvap 1 28800 3 rst.nc EXPORTED
+ATFLXEMP OTotEvap 1 5400 3 rst.nc EXPOUT
 180 90 182 149 lmdz torc
 P 0 P 2 
@@ -114 +114 @@
 INT=1
 #
-ATFLXEMP OIceEvap 1 28800 3 rst.nc EXPORTED
+ATFLXEMP OIceEvap 1 5400 3 rst.nc EXPOUT
 180 90 182 149 lmdz torc
 P 0 P 2 

utils/tools_CPL_OASIS_ticket2379_2020/TOYATM/src/toyatm.F90

@@ -66 +66 @@
   LOGICAL                       :: ln_rstart, nn_date0, nn_time0, nn_leapy  , nn_istate, nn_stock, nn_write ,nn_chunksz, nn_euler,nn_wxios
   CHARACTER (len=256)           :: cn_exp , cn_ocerst_in, cn_ocerst_indir, cn_ocerst_out, cn_ocerst_outdir
-  REAL (kind=wp)                :: rn_rdt
+  REAL (kind=wp)                :: rn_Dt
   LOGICAL                       :: ln_linssh, ln_crs, ln_meshmask
-  REAL (kind=wp)                :: rn_isfhmin, rn_atfp
+  REAL (kind=wp)                ::  rn_atfp
   !
   ! NEMO namelists
-!!  NAMELIST/namrun/ nn_it000, nn_itend
-!!  NAMELIST/namdom/ rn_rdt
       NAMELIST/namrun/ cn_ocerst_indir, cn_ocerst_outdir, nn_stocklist, ln_rst_list,                 &
          &             nn_no   , cn_exp   , cn_ocerst_in, cn_ocerst_out, ln_rstart , nn_rstctl ,     &
@@ -78 +76 @@
          &             nn_stock, nn_write , ln_mskland  , ln_clobber   , nn_chunksz, nn_euler  ,     &
          &             ln_cfmeta, ln_iscpl, ln_xios_read, nn_wxios
-      NAMELIST/namdom/ ln_linssh, rn_isfhmin, rn_rdt, rn_atfp, ln_crs, ln_meshmask
+      NAMELIST/namdom/ ln_linssh, rn_Dt, rn_atfp, ln_crs, ln_meshmask
   !
   !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -133 +131 @@
   !
 ! Get time step and number of iterations from ocean
-  time_step = INT(rn_rdt)
+  time_step = INT(rn_Dt)
   niter = nn_itend - nn_it000 + 1 
   !