Changeset 6170 for CONFIG

Timestamp:

06/15/22 12:58:43 (22 months ago)

Author:

cetlod

Message:

CM65_work: minor corrections on isf flux

Location:

CONFIG/UNIFORM/v6/IPSLCM6.5.1

Files:

• EXPERIMENTS/IPSLCM/piControl_TEST/config.card (modified) (9 diffs)
• GENERAL/PARAM/conv_param.data_NPv5.17c (modified) (1 prop)
• GENERAL/PARAM/ep_param.data_NPv5.17c (modified) (1 prop)
• SOURCES/NEMO/isfcavmlt.F90 (added)
• SOURCES/NEMO/isfparmlt.F90 (modified) (2 diffs)
• compile_ipslcm6.sh (modified) (1 prop)

CONFIG/UNIFORM/v6/IPSLCM6.5.1/EXPERIMENTS/IPSLCM/piControl_TEST/config.card

@@ -56 +56 @@
 OverRule=y
 #D- Last day of the experience used as restart for all components
-RestartDate=2149-12-31
+RestartDate=2349-12-31
 #D- Define restart simulation name for all components
 RestartJobName=CM65v420-LR-SKL-pi-05
@@ -69 +69 @@
 # Last day of the experience used as restart for this component if Restart=y
 # #D- Last day of the experience used as restart for all components
-RestartDate=2149-12-31
+RestartDate=2349-12-31
 #D- Define restart simulation name for all components
 RestartJobName=CM65v420-LR-SKL-pi-05
@@ -83 +83 @@
 #-- Last day of the experience used as restart for this component if Restart=y
 ##D- Last day of the experience used as restart for all components
-RestartDate=2149-12-31
+RestartDate=2349-12-31
 #D- Define restart simulation name for all components
 RestartJobName=CM65v420-LR-SKL-pi-05
@@ -97 +97 @@
 ##-- Last day of the experience used as restart for this component if Restart=y
 ##D- Last day of the experience used as restart for all components
-RestartDate=2149-12-31
+RestartDate=2349-12-31
 #D- Define restart simulation name for all components
 RestartJobName=CM65v420-LR-SKL-pi-05
@@ -110 +110 @@
 ##-- Last day of the experience used as restart for this component if Restart=y
 #D- Last day of the experience used as restart for all components
-RestartDate=2149-12-31
+RestartDate=2349-12-31
 #D- Define restart simulation name for all components
 RestartJobName=CM65v420-LR-SKL-pi-05
@@ -123 +123 @@
 # Last day of the experience used as restart for this component if Restart=y
 #D- Last day of the experience used as restart for all components
-RestartDate=2149-12-31
+RestartDate=2349-12-31
 #D- Define restart simulation name for all components
 RestartJobName=CM65v420-LR-SKL-pi-05
@@ -136 +136 @@
 # Last day of the experience used as restart for this component if Restart=y
 #D- Last day of the experience used as restart for all components
-RestartDate=2149-12-31
+RestartDate=2349-12-31
 #D- Define restart simulation name for all components
 RestartJobName=CM65v420-LR-SKL-pi-05
@@ -150 +150 @@
 # Last day of the experience used as restart for this component if Restart=y
 #D- Last day of the experience used as restart for all components
-RestartDate=2149-12-31
+RestartDate=2349-12-31
 #D- Define restart simulation name for all components
 RestartJobName=CM65v420-LR-SKL-pi-05
@@ -184 +184 @@
 [Executable]
 #D- For each component, Real name of executable, Name of executable for oasis
+## For JZ ATM= (gcm_${ResolAtm}_${OptMode}.e, lmdz.x, 71MPI, 10OMP)
 ATM= (gcm_${ResolAtm}_${OptMode}.e, lmdz.x, 71MPI, 8OMP)
 SRF= ("" ,"" )

CONFIG/UNIFORM/v6/IPSLCM6.5.1/SOURCES/NEMO/isfparmlt.F90

@@ -201 +201 @@
       !
       ! 0. ------------Read specified runoff
-      CALL fld_read ( kt, 1, sf_isfpar_fwf   )
+!      CALL fld_read ( kt, 1, sf_isfpar_fwf   )
       !
       ! 1. ------------Mean freezing point (needed for heat content flux)
@@ -211 +211 @@
       ! 2. ------------Scale isf melt pattern with total amount from oasis
       ! ice shelf 2d map of fwf from isf to oce
-      zfwf(:,:) = sf_isfpar_fwf(1)%fnow(:,:,1)
+!      zfwf(:,:) = sf_isfpar_fwf(1)%fnow(:,:,1)
       !
       ! compute glob sum from input file
       ! (PM) should we consider delay sum as in fwb ? (it will offset by 1 time step if I understood well)
-      zfwf_fld = glob_sum('isfcav_mlt', e1e2t(:,:) * zfwf(:,:))
+!      zfwf_fld = glob_sum('isfcav_mlt', e1e2t(:,:) * zfwf(:,:))
       !
       ! compute glob sum from atm->oce ice shelf fwf
       ! (PM) should we consider delay sum as in fwb ?
-      zfwf_oasis = glob_sum('isfcav_mlt', e1e2t(:,:) * fwfisf_oasis(:,:))
+!      zfwf_oasis = glob_sum('isfcav_mlt', e1e2t(:,:) * fwfisf_oasis(:,:))
       !
       ! scale fwf
-      zfwf(:,:) = zfwf(:,:) * zfwf_oasis / zfwf_fld
+ !     zfwf(:,:) = zfwf(:,:) * zfwf_oasis / zfwf_fld
       ! 
       ! 3. -----------Define fwf and qoce
       ! ocean heat flux is assume to be equal to the latent heat
 !      pqfwf(:,:) =   zfwf(:,:)                         ! fwf                ( > 0 from isf to oce)
-      pqfwf(:,:) =   fwfisf_oasis(:,:)                         ! fwf                ( > 0 from isf to oce)
+      pqfwf(:,:) =   fwfisf_oasis(:,:)                  ! fwf                ( > 0 from isf to oce)
       pqoce(:,:) = - pqfwf(:,:) * rLfusisf             ! ocean heat flux    ( > 0 from isf to oce) (assumed to be the latent heat flux)
       pqhc (:,:) =   pqfwf(:,:) * ztfrz(:,:) * rcp     ! heat content flux  ( > 0 from isf to oce)