From 3e3ca1836705e6d15a0e5874567267a0accc4bec Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Wed, 6 Nov 2024 07:22:25 -0700 Subject: [PATCH] backout the timestamp on rpointer files until alpha05c, remove unused rpfile parameters --- datm/datm_datamode_clmncep_mod.F90 | 1 - datm/datm_datamode_cplhist_mod.F90 | 1 - datm/datm_datamode_era5_mod.F90 | 1 - datm/datm_datamode_gefs_mod.F90 | 1 - datm/datm_datamode_jra_mod.F90 | 1 - datm/datm_datamode_simple_mod.F90 | 1 - docn/docn_datamode_copyall_mod.F90 | 1 - docn/docn_datamode_cplhist_mod.F90 | 1 - docn/docn_datamode_multilev_dom_mod.F90 | 1 - docn/docn_datamode_multilev_mod.F90 | 1 - drof/rof_comp_nuopc.F90 | 1 - dshr/dshr_mod.F90 | 6 ++++-- dwav/wav_comp_nuopc.F90 | 1 - 13 files changed, 4 insertions(+), 14 deletions(-) diff --git a/datm/datm_datamode_clmncep_mod.F90 b/datm/datm_datamode_clmncep_mod.F90 index f11aa167c..78b3bf4db 100644 --- a/datm/datm_datamode_clmncep_mod.F90 +++ b/datm/datm_datamode_clmncep_mod.F90 @@ -102,7 +102,6 @@ module datm_datamode_clmncep_mod character(*), parameter :: nullstr = 'null' - character(*), parameter :: rpfile = 'rpointer.atm' character(*), parameter :: u_FILE_u = & __FILE__ diff --git a/datm/datm_datamode_cplhist_mod.F90 b/datm/datm_datamode_cplhist_mod.F90 index 2765bc157..ca53ed78d 100644 --- a/datm/datm_datamode_cplhist_mod.F90 +++ b/datm/datm_datamode_cplhist_mod.F90 @@ -41,7 +41,6 @@ module datm_datamode_cplhist_mod real(r8), pointer :: Faxa_swnet(:) => null() character(*), parameter :: nullstr = 'null' - character(*), parameter :: rpfile = 'rpointer.atm' character(*), parameter :: u_FILE_u = & __FILE__ diff --git a/datm/datm_datamode_era5_mod.F90 b/datm/datm_datamode_era5_mod.F90 index 2ba91cc78..187c3b5d7 100644 --- a/datm/datm_datamode_era5_mod.F90 +++ b/datm/datm_datamode_era5_mod.F90 @@ -59,7 +59,6 @@ module datm_datamode_era5_mod real(r8) , parameter :: rhofw = SHR_CONST_RHOFW ! density of fresh water ~ kg/m^3 character(*), parameter :: nullstr = 'undefined' - character(*), parameter :: rpfile = 'rpointer.atm' character(*), parameter :: u_FILE_u = & __FILE__ diff --git a/datm/datm_datamode_gefs_mod.F90 b/datm/datm_datamode_gefs_mod.F90 index 66b991d89..fb7a0b4dc 100644 --- a/datm/datm_datamode_gefs_mod.F90 +++ b/datm/datm_datamode_gefs_mod.F90 @@ -49,7 +49,6 @@ module datm_datamode_gefs_mod real(r8) , parameter :: rhofw = SHR_CONST_RHOFW ! density of fresh water ~ kg/m^3 character(*), parameter :: nullstr = 'undefined' - character(*), parameter :: rpfile = 'rpointer.atm' character(*), parameter :: u_FILE_u = & __FILE__ diff --git a/datm/datm_datamode_jra_mod.F90 b/datm/datm_datamode_jra_mod.F90 index e09844ace..2e0e5ee67 100644 --- a/datm/datm_datamode_jra_mod.F90 +++ b/datm/datm_datamode_jra_mod.F90 @@ -58,7 +58,6 @@ module datm_datamode_jra_mod real(R8) , parameter :: dLWarc = -5.000_R8 character(*), parameter :: nullstr = 'null' - character(*), parameter :: rpfile = 'rpointer.atm' character(*), parameter :: u_FILE_u = & __FILE__ diff --git a/datm/datm_datamode_simple_mod.F90 b/datm/datm_datamode_simple_mod.F90 index da88fc640..454bceeac 100644 --- a/datm/datm_datamode_simple_mod.F90 +++ b/datm/datm_datamode_simple_mod.F90 @@ -76,7 +76,6 @@ module datm_datamode_simple_mod real(R8) , parameter :: dLWarc = -5.000_R8 character(*), parameter :: nullstr = 'null' - character(*), parameter :: rpfile = 'rpointer.atm' character(*), parameter :: u_FILE_u = & __FILE__ diff --git a/docn/docn_datamode_copyall_mod.F90 b/docn/docn_datamode_copyall_mod.F90 index 85d625fee..1c447677d 100644 --- a/docn/docn_datamode_copyall_mod.F90 +++ b/docn/docn_datamode_copyall_mod.F90 @@ -27,7 +27,6 @@ module docn_datamode_copyall_mod real(r8) , parameter :: ocnsalt = shr_const_ocn_ref_sal ! ocean reference salinity character(*) , parameter :: nullstr = 'null' - character(*) , parameter :: rpfile = 'rpointer.ocn' character(*) , parameter :: u_FILE_u = & __FILE__ diff --git a/docn/docn_datamode_cplhist_mod.F90 b/docn/docn_datamode_cplhist_mod.F90 index 81ac40224..f913ad467 100644 --- a/docn/docn_datamode_cplhist_mod.F90 +++ b/docn/docn_datamode_cplhist_mod.F90 @@ -27,7 +27,6 @@ module docn_datamode_cplhist_mod real(r8) , parameter :: ocnsalt = shr_const_ocn_ref_sal ! ocean reference salinity character(*) , parameter :: nullstr = 'null' - character(*) , parameter :: rpfile = 'rpointer.ocn' character(*) , parameter :: u_FILE_u = & __FILE__ diff --git a/docn/docn_datamode_multilev_dom_mod.F90 b/docn/docn_datamode_multilev_dom_mod.F90 index 9c8c35be9..c6413f018 100644 --- a/docn/docn_datamode_multilev_dom_mod.F90 +++ b/docn/docn_datamode_multilev_dom_mod.F90 @@ -40,7 +40,6 @@ module docn_datamode_multilev_dom_mod ! constants character(*) , parameter :: nullstr = 'null' - character(*) , parameter :: rpfile = 'rpointer.ocn' character(*) , parameter :: u_FILE_u = & __FILE__ diff --git a/docn/docn_datamode_multilev_mod.F90 b/docn/docn_datamode_multilev_mod.F90 index aaa24258f..11f9dc43f 100644 --- a/docn/docn_datamode_multilev_mod.F90 +++ b/docn/docn_datamode_multilev_mod.F90 @@ -32,7 +32,6 @@ module docn_datamode_multilev_mod ! constants character(*) , parameter :: nullstr = 'null' - character(*) , parameter :: rpfile = 'rpointer.ocn' character(*) , parameter :: u_FILE_u = & __FILE__ diff --git a/drof/rof_comp_nuopc.F90 b/drof/rof_comp_nuopc.F90 index e35f78fd0..520057d90 100644 --- a/drof/rof_comp_nuopc.F90 +++ b/drof/rof_comp_nuopc.F90 @@ -81,7 +81,6 @@ module cdeps_drof_comp logical :: diagnose_data = .true. integer , parameter :: main_task=0 ! task number of main task - character(*) , parameter :: rpfile = 'rpointer.rof' #ifdef CESMCOUPLED character(*) , parameter :: modName = "(rof_comp_nuopc)" #else diff --git a/dshr/dshr_mod.F90 b/dshr/dshr_mod.F90 index 7d6bd71f8..9acf60919 100644 --- a/dshr/dshr_mod.F90 +++ b/dshr/dshr_mod.F90 @@ -1058,6 +1058,7 @@ subroutine dshr_restart_write(rpfile, case_name, model_name, inst_suffix, ymd, t type(io_desc_t) :: pio_iodesc integer :: oldmode integer :: rcode + character(len=CS) :: lrpfile character(*), parameter :: F00 = "('(dshr_restart_write) ',2a,2(i0,2x))" !------------------------------------------------------------------------------- @@ -1067,10 +1068,11 @@ subroutine dshr_restart_write(rpfile, case_name, model_name, inst_suffix, ymd, t call shr_cal_datetod2string(date_str, ymd, tod) write(rest_file_model ,"(7a)") trim(case_name),'.', trim(model_name),trim(inst_suffix),'.r.', trim(date_str),'.nc' - + ! temporarily turn off timestamp, remove this code and comment in alpha05c + lrpfile = rpfile(:len_trim(rpfile)-17) ! write restart info to rpointer file if (my_task == main_task) then - open(newunit=nu, file=trim(rpfile), form='formatted') + open(newunit=nu, file=trim(lrpfile), form='formatted') write(nu,'(a)') rest_file_model close(nu) write(logunit,F00)' writing ',trim(rest_file_model) diff --git a/dwav/wav_comp_nuopc.F90 b/dwav/wav_comp_nuopc.F90 index 0a5a25d02..61150fedd 100644 --- a/dwav/wav_comp_nuopc.F90 +++ b/dwav/wav_comp_nuopc.F90 @@ -83,7 +83,6 @@ module cdeps_dwav_comp ! constants logical :: diagnose_data = .true. integer , parameter :: main_task=0 ! task number of main task - character(*) , parameter :: rpfile = 'rpointer.wav' #ifdef CESMCOUPLED character(*) , parameter :: modName = "(wav_comp_nuopc)" #else