Changeset 5023 for LMDZ6/trunk

Timestamp:

Jul 5, 2024, 4:53:42 PM (2 months ago)

Author:

Sebastien Nguyen

Message:

change pbl_surface and associated routines to symlinks towards phylmd routines

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• fonte_neige_mod.F90 (added)
• ocean_forced_mod.F90 (added)
• pbl_surface_mod.F90 (added)
• phys_local_var_mod.F90 (modified) (1 diff)
• phys_output_ctrlout_mod.F90 (modified) (2 diffs)
• phys_output_mod.F90 (modified) (2 diffs)
• physiq_mod.F90 (modified) (2 diffs)
• surf_land_bucket_mod.F90 (added)
• surf_land_mod.F90 (added)
• surf_landice_mod.F90 (added)
• surf_ocean_mod.F90 (added)
• surf_seaice_mod.F90 (added)

LMDZ6/trunk/libf/phylmdiso/phys_local_var_mod.F90

@@ -1042 +1042 @@
       ALLOCATE(xtrunoff_diag(niso,klon))
       ALLOCATE(h1_diag(klon),runoff_diag(klon))
+!SN
+      runoff_diag(:)=0. ; xtrunoff_diag(:,:)=0. ! because variables are only given values on knon grid points
 #endif
 !

LMDZ6/trunk/libf/phylmdiso/phys_output_ctrlout_mod.F90

@@ -2000 +2000 @@
   TYPE(ctrl_out), SAVE, ALLOCATABLE :: o_xtoliq(:)
   TYPE(ctrl_out), SAVE, ALLOCATABLE :: o_xtcond(:)
+  TYPE(ctrl_out), SAVE, ALLOCATABLE :: o_xtrunoff_diag(:)
   TYPE(ctrl_out), SAVE, ALLOCATABLE :: o_dxtdyn(:)
   TYPE(ctrl_out), SAVE, ALLOCATABLE :: o_dxtldyn(:)
@@ -2097 +2098 @@
   TYPE(ctrl_out), SAVE :: o_runoff = ctrl_out((/ 1, 1, 10, 1, 10, 10, 11, 11, 11, 11/), &
     'runoff', 'Run-off rate land ice', 'kg/m2/s', (/ ('', i=1, 10) /))
+#ifdef ISO
+  TYPE(ctrl_out), SAVE :: o_runoff_diag = ctrl_out((/ 1, 1, 10, 1, 10, 10, 11, 11, 11, 11/), &
+    'runoffland', 'Run-off rate land for bucket', 'kg/m2/s', (/ ('', i=1, 10) /))
+#endif
   TYPE(ctrl_out), SAVE :: o_albslw3 = ctrl_out((/ 1, 1, 1, 1, 10, 10, 11, 11, 11, 11/), &
     'albslw3', 'Surface albedo LW3', '-', (/ ('', i=1, 10) /))

LMDZ6/trunk/libf/phylmdiso/phys_output_mod.F90

@@ -178 +178 @@
     ALLOCATE(o_xtoliq(ntraciso))
     ALLOCATE(o_xtcond(ntraciso))
+    ALLOCATE(o_xtrunoff_diag(ntraciso))
     ALLOCATE(o_dxtdyn(ntraciso))
     ALLOCATE(o_dxtldyn(ntraciso))
@@ -569 +570 @@
       o_xtcond  (ixt)=ctrl_out(flag,  'ocond'//TRIM(outiso),       'Condensed water', unit, [('',i=1,nfiles)])
 
+      flag = [1,  1,  1, 10, 5, 10, 11, 11, 11, 11]; unit = 'kg/m2/s'
+      o_xtrunoff_diag  (ixt)=ctrl_out(flag, 'runoffland'//TRIM(outiso), 'Run-off rate land for bucket', unit, [('',i=1,nfiles)])
+
       flag = [4, 10, 10, 10, 10, 10, 11, 11, 11, 11]; unit = '(kg/kg)/s'
       o_dxtdyn  (ixt)=ctrl_out(flag,  'dqdyn'//TRIM(outiso),           'Dynamics dQ', unit, [('',i=1,nfiles)])

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -2683 +2683 @@
     ENDDO
 #ifdef ISO
-    do ixt=1,ntraciso
+    DO ixt=1,ntraciso
     xtql1(ixt,:)=0.0
     DO k = 1, klev
@@ -2694 +2694 @@
       ENDIF
     ENDDO !DO k = 1, klev
-    enddo !do ixt=1,ntraciso
+    ENDDO !DO ixt=1,ntraciso
 #endif
     ENDIF